Merging 'master' branch to 'api' branch