Merge branch 'release/v1.0.21'