Cherry pick commits from master