Merge "Workaround for Neoverse N1 erratum 1868343" into integration