Merge "Add TIAF3 feature flag" into main