align parameter not saved (#3057)
Merge branch 'branch-6-2'