FlexBridgeBeta merge