Merge "Allow "opaque" flag to be updated"