test 6721c37e-f722-4fee-bbf4-2e38b43479bf (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue