Merge branch 'AndrzejKurek-opaque-keys-interfaces' into opaque-keys-interfaces