Merge "Always invoke callback" into oc-mr1-dev