Merge branch 'bridge-fdbs-bitops'