Merge branch 'callbacks-cleanup'