DDF-697: Changed gml 3.1 to 3.2 plus additional changes