Merge "Implement alignment checks in PM" into main