Merge "Quick change to add default to deprecated callback method so implementors can move to new api." into sc-dev