Merge "chore(cpus): optimise runtime errata applications" into integration