Merge the dev branch into master for official release
Merge the dev branch into master for official release