Merge "Errata workarounds N1 1043202, 1315703 default off" into integration