@dhavens I'm not sure if there is an ongoing MR that this will conflict with. I hope not.
cc @grzesiek