Tech debt/384/minification



<!---
@huboard:{"order":238.086669921875,"milestone_order":426,"custom_state":"ready"}
-->