Merge branch 'release/0.0.2.22-POSTRELEASE'