Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10