re #878 - Cleanup
re #878 - Added proper translations
Merge branch 'feature/878-bin' into staging