Update align from master.