Merge "Add support for multiple callback registration in." into nyc-dev