Merge "Fix missing callback" into main