Merging dev branch into integration branch

merge to v0.10.0