Merge "Add more information to WTF to investigate bug 37809561" into oc-dev