DDF-285 Fixing merge issues, and upgrading versions.