[BISERVER-8697] Enhancements and bug-fixes