Fix BRIDGE-278