changes in develop for ssv_2