updated status from wlf commit d16456b