test 2876ac18-7fb5-4139-80cd-e4c36813fc1b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue