Merging "omf" branch into "default".