groupy branch: temp fix until this view is removed
groupy branch: temp fix until this view is removed

cgorringe/oscurrency,lazzarello/bk-tb-remote,cgorringe/oscurrency,cgorringe/oscurrency,lazzarello/bk-tb-remote