test fc14c9a6-aabf-470a-9535-37c040f99dea (rebased onto develop)



This is the same as gh-6882 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testPushRebaseContinue