I am happy with this pull request, it can be merged after the required fix in nrmllib is done, LGTM