Merge branch 'release/0.0.2.16-POSTRELEASE'