Added changes for RT #86584