Merge branch 'api-last-release'