Merge branch 'master' into housekeeping-doc