test 133aa915-4d1a-43dd-9aa7-daab26da4e6f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue