Merge commit 'e930b112d14d7acd050d5087d11b6dd4c56a8e4e' into release/0.10