Merge "Add flag for adjacent TF refactor" into main