Merge commit '5e0fb5df2ee8' into pti-x32-v7