Merging to dev branch

Merging to dev branch