PRD-4613 bugfix, BISERVER-9761 cosmetics