Merge "Only align when necessary" into nyc-dev