Sorry, yes, this question is not related to this PR.

Seems ready to merge otherwise.