Item 2 of 3 from #4164

Signed-off-by: Mathieu Parent <math.parent@gmail.com>