Techdebt/231/catch up



<!---
@huboard:{"order":60.0625,"milestone_order":235,"custom_state":"blocked"}
-->