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