Small alignment fix again
Merge branch 'hotfix-2.1.12' into develop