Merge "fix tca steps for standalone"