Merge branch 'hotfix/devise_fix' into dev