Merge commit '0.10.2' into import