Merging changes from dev branch. 3.0.0.8 release