dock: fix workarea
Merge branch 'master' into develop