BZ-0000: Fixing merge issue