[#44528397] Past fixes