Merge "Extend page alignment compat to cover x86_64." into main