Wip 9113

Backport: dumpling, firefly, giant