This is also new functionality not related with the scope of the PR.