Merge branch 'release/3.16' into develop
no need to try/except from future blocks
version bump
Merge branch 'release/3.17'