Merge "Update for new tca blueprint"