Merge commit '15c2e8027f4827018608badb1bff1294af1810e4' into release/0.10