Merge branch 'feature/create-backgroundtask-welcome_email' into develop