Merge "Adding debugging for bug 62241"