NIC entity
Merge branch 'master' of github.com:CCI-MOC/moc-public