am 368a1f93: Merge "Store the key characteristics for operations"

* commit '368a1f93381584fdd9ae0d59748cce5e4160acfb':
  Store the key characteristics for operations