Merge dev

Merge the current dev branch