IDE-904
IDE-904

Refactored context creation.