BISERVER-10102 - Fixed merge problems