test b73cfd28-21e4-41d2-a749-c9c8b8dcff39 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue