Merge branch 'pr_1293' into feature-opaque-keys