DF-185 fixed crash after merge to_master into master