Misc fixes
Extended ocp_merge importer