test 0b60ec19-45ed-43a7-aab6-11611b5e50f0 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue