[DF-29] Temporary fixes