Merge "Readd predictive back developer setting" into main