BZ-12231: fix merge issue