Merge commit 'separate-root' into release-branch-separate-root

* commit 'separate-root':
  base commit for reject-separate-root
Status Job ID Name Coverage
  External
passed ghostflow-commit-check