updated status from nic commit 239636c