[deployment-guide/comm-rel-14: 294/677] Merge branch 'master' into ent