bug/348/moreOfflickBugs



<!---
@huboard:{"order":228.125,"milestone_order":349,"custom_state":"ready"}
-->