Merge branch 'master' into t4_enhancements
ticket:4 deleted extra imports and added check of type of included context
Merge branch 't4_enhancements'