Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10