Merge branch 'fix/email-task-otp' into 'develop'