Cherry picking and conflict resolution from master.