Merge from master to opaque-keys