* Upstream patch: 施子、饢