Merge commit '2ed8a550da524434deb3b89f7ec62ed833bedac5' into release/0.10