Merge "Remove the explicit callback, not all of them" into sc-dev