cherry picks scott's commit on master