Merge changes I180c5c1e,Ica7669ea,I63235684

* changes:
  Adds missing model type
  Removes obsolete Type in OperationVariable
  Fixes minor bugs