test c847abd6-c310-4dc9-a9cf-d83021de0299 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue