enhancement/367/updateModes



<!---
@huboard:{"order":180.6953125,"milestone_order":375,"custom_state":"ready"}
-->