merged model adaptions to cdmlib 3.2.4 from campanula branch