address comments from CR
Jeromy authored
6da12b53