Merge "Do not crash on failures in callbacks" into main