Merge branch 'dev' into epaminond
Removed unused /public-contact-list route
Merged