PRD-4653 and fixes for broken BISERVER-9988 fix