Merge "fix(errata): check for SCU before accessing DSU" into integration