Merge "Add handler parameter for callbacks." into mnc-dev