test 8a788eb8-d19f-4de5-825a-3697eb3caafe (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue