TEAMCITY-GIT-CR-7 TW-56415 Fix after review