[biserver-10429] incemental changes