imported patch spelling
Merge branch 'develop' into fine-grained-durability