Merge "Fix Fatal Exception in UserCapabilityExchangeImpl"