This is **only** for the NI (fixup for the previous commit).

I don't think it makes sense to create extra issue or bnc for it.