Merging commits from 0.6.0-M1 to master