#4137 First pass running with Unity
#4137 Removing Context