Core changes related to unity #5675706715344