Merge branch labelAlignmentSettings into mysigma