Port the changes made to the dev branch