It looks like a bug fix that is unrelated to this series. Does it deserve a separate commit ?