Merge "Free unneeded obsolete maps" into oc-dev