updated status from zaf commit 0338524