Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64