BUG-4295: fix merge callsite