Merge "Support center alignment"