
        Manual cherry-pick of #379

2f7f16d