Merge remote branch 'gerrit/api_changes' into merge-master