Notifications fix
Form split fix
Merge branch 'hotfix/hotfix'