am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE

* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
  Allow "opaque" flag to be updated. DO NOT MERGE