[3.7.7] latest fixes