Merge changes from topic "mar8" into sc-dev

* changes:
  Refinement of ContextParams behavior.
  Relax null checks to fix tests.