Merge master into opaque-keys