Merge branch 'improve-move-notificaions-api' into 'develop'