Merge changes I185d3723,Id674576a

* changes:
  Introduce SessionCallbackLink
  Introduce ControllerCallbackLink