Merge branch 'release/2.1.13' into develop
Fix as_tuple
Update version
Merge branch 'release/2.1.14'