Merging latest changes from dev branch