[DF-29][DF-2706] fixes for issues during merge with game