Merge "Eliminate Extra Callback from..." into sc-v2-dev