Merge commit 'a465ed5707f5cbc9713d5e9629d424cd2d46e038' into release/0.10