Merge branch 'dock' into test