Disable dock until fully working
Merge branch 'master' into ESSENTIAL_254