Merge commit 'e17dc0a254ac8d3c33887a114a66e2b659ba0bc5' into release/0.10