Fix: Wrong cache key
Change missing catalog's response code to 404
Fix login error.
Ticket #908
Improve login error
Ticket #908
Merge branch 'dev'
Merge branch 'master' into dev