Merge branch 'odp_fixes' into hmm.git