stash
Merge branch 'master' into stash
Remove user account details controller references in tests