Merge "Enable predictive back in TAPL tests" into main