Merge branches 'release' and 'doc' into release