Not sure if/when we are going to delete the v4-dev branch to avoid confusion, but we should target master from now on.