update from 2.38 release(s)