Merge commit '0.3.1-RC3' into next