Merge "add flag for future removal of Align enum"