Merge "Change default use of Model Loader to TRUE"