Dev to Master merge

Merging changes from dev to master