updated status from nfk commit 20f4eae