- BZ-982543: partial fix and improvements