Merge "Fix the tca policy"