Merge changes from topic 'jeanluc-context'

* changes:
  Rename ctxt to context.
  Fix build break due to ctxt->context rename.