test 12dddc94-df66-401d-890b-17d2ccd117b0 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue