Master cherrypick