merge changes up to 2.17.0