Merge "Bypass compilation errors due to compiler upgrade"