address comments from CR
Jeromy authored
9049dae6