Bugfix: Wrong dock name in set_initial_layout
Merge remote-tracking branch 'origin/develop' into develop