Merge "Fixing bug #63738: Debug msg not showing correctly"