Merge "Reland "Implement alignment checks in PM"" into main