Merge "Refactor TISM add/remove code" into oc-dev