test 071cd0a9-6412-4f74-8a3a-3d4542856d4f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue