updated status from shn commit e804bcc