Merge commit '0.6'