test 5e8ff3b9-65e6-4409-aafd-aed50ed207c4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue