test 30206f33-d574-4042-97bd-e8d77fb01408 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue