Staticrefactoring merging to develop branch

Contains refactoring of 2.1.4 Implicit dependency of Static methods