Small change
Merge branch 'dev_context' into dev_lwk5

Conflicts:
	vp-detection