- phase4/6 PRs merged: `#6679` `#6680`