separated internal commands from external commands
Merge branch 'networkapi-refactor' into networkapi_4.2.0