Merge branch 'hotfix/fix_reminder_sending'
Merge branch 'master' into develop