merge in changes up to 2.17.0