SWITCHYARD-1260: fix issues in merged model code