Feature csf include deceased update

Will resolve #583 and #584