Merge from dev branch

Merged dev branch in to stable