Merge "Fixed alignment"