Bringing in the changes to dev branch