merge 40.16 changes