Feature/325/byod/v/0/2/0



<!---
@huboard:{"order":230.859375,"milestone_order":364,"custom_state":"ready"}
-->