refs #1727 : modified - code for 2.0 context model.

 -