Merge "Shift configuration callback from dispatcher to reader" into main