Yesterday
Merge from modelviewer_build_fix