Update align from master.
Update predef from master.