More logging for the merged models problem.
Merge branch 'master' into production