- BZ-1011170: further updates