Merge "Fixed bug due to not updating TC information (with regression test)" into oc-dev