MPS-19815 NPE while checkouting from git
Merge branch 'MPS3.1'