test 3f68c7ee-039a-49ff-bba5-4190f8d929fb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue