Yeah I concluded exactly the same - will be added in the next pr (Core NS).