TSTGITPLUG-1 refactoring-10