updated status from shn commit 4636978