Merge branch 'bsn_det_vport'