Merge 'master' branch into 'master-cl'