sync with changes to 1.9.18 tree