Merge "Revert "Revert "Add new TARE directory."""