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