Wolf-305
wolf 270
#WOLF-297
#Wolf-39
resharper violation fix
Merge branch 'Leon_Jira_Sprint2'