Reapplying 53e2b19 commit because of incorrect model format (*.mpb) used