Merge "Bring along BridgeContext for the ride." into klp-dev