Merge branch 'release/0.2.17' into develop
Fix tests.
0.2.18
Merge branch 'release/0.2.18'