Merge from dev

Merge from dev branch