manual merge: tc scv import by harningt