925: Website creation is giving generic error instead of using error template
Merge remote-tracking branch 'upstream/dev' into dev
remove duplicate code
Add missing CLI
Add missing fix
Fix typo
Merge pull request #926 from andrerod/dev

#925: Website creation is giving generic error instead of using error template