Try to pass error test
Merge branch 'release/v0.2.21'