Merge "Remove extra dispatch variable" into main