Enhancement/399/upload zooms



<!---
@huboard:{"order":243.836669921875,"milestone_order":435,"custom_state":"ready"}
-->