Merge "Alignment correction" into casablanca