test e6d498df-b42d-4916-a0a8-3db577d41d83 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue