Merge branches 'release' and 'dock' into release