updated status from flk commit 12b11e5