Bump metadata JSON to 3.16.1-pre
Merge branch 'dev-master' into dev-3.x
Bump metadata JSON to 3.17.0-pre