Merged from develop
Initial adding of submodules update for nts specific