switching to GDP version 20 for new release
forgot to pull, fixed conflict
last commit before release