Merge the latest 'api' into 'master'