Merge "Migrating prediction_undo to aconfig" into main