[DF-None] Integration of optimzation changes from WOTGenerals Team.