Reworked context handling to be faster
Avoid some work when not tracking context
Merge branch 'improve-context-handling' into dev

Conflicts:
	ack