Update fork

Rebase the fork to the latest noty version (v2.2.9).