Merge commit '0.3.1-RC2' into next