Public Implementation, Updates Image to be MultiModel Compatible
Merge origin/master