Merge "Remove handler callbacks correctly" into main