Merge branch 'release/0.0.2.18-POSTRELEASE'