v2.0.16, see ChangeLog for details
Merge branch 'release/2.0.16' into develop