Merge "Workaround for Neoverse N1 erratum 1800710" into integration