Definitely we should add it - but I IMO - not in scope of this PR (I think it should be rolled out ASAP)