[3.7] 3.7.5 fixes