context ala nova

Change-Id: I7532b738b2abafbd9f5b3e1aee57181fb6b3ba6c