Merge branch 'release/0.3.16' into develop