Misc fixes
Extended ocp_merge importer
Merged with v9