Oh, yeah, definitely.

:warning: @gleseur you should review this when you merge and release, based on your progress on OPS-1317...