Merge commit 'c5da487a38f93b981c4933d4e0b09c49c319fbb7' into release/0.10