Promote #77138186 and #77219444 to staging

[delivers #77138186 and #77219444]