Merge "fix(errata): workaround for DSU-110 erratum 2313941" into integration