Merge "Fix for N1 1043202 Errata Workaround" into integration