Merge "Fix support for enum attributes in BridgeContext"