Merge branch 'features/baseline_multiline_label_fixes' into features/baseline_multiline_label_fixes_docking