Catch `api-v2` up to `master`

@ssorallen Performed a test merge locally, build looks OK.