Merge branch '2020-09-30-add-new-apis' into next