test 5a0eea5d-217f-499b-8f46-98e9217e4977 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue