Update predef from master.
Update align from master.