Merge kpflemings moh_files fixes (bug #3224)