[BISERVER-11504] splitting out features