test 32428a9d-2cf8-48ee-89fa-787e1693e7fd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue