Merge "Propagate tree on setting selection strategy" into main