test def7d006-0001-4ef6-bfec-c1b60e99d0c3 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue