Updated dev branch to be up-to-date with release