merge in web2 changes from 3.8.7 to 3.8.8