Manual copy of all the updates from the dev branch