Merge "Add compatibility back callbacks."