Merge "errata: workaround for Neoverse V1 errata 1966096" into integration