Merge "Add resetCb"