BZ-12932 fixed merge issue in integration branch