Preliminary fixes for handling new icmc models
Merge branch 'icmc' of https://github.com/woodshop/deepAutoController into icmc