Also incorporate these changes: https://github.com/DeltaSystems/dewdrop/commit/721ba8605c94ec10bcc0420f988ebab8de87cdaf