Merge dev changes in from personal dev branch

Yep.