updated status from nzl commit 845c64c