[DF-5025] Fixes for updated game branch