Merge latest master into opaque-keys