[core-workflow] Re: DO-NOT-MERGE-UNTIL-3.9