* Grave digging and decomposition * fix * update based on review comments * code review * remove unused field (cherry picked from commit fd7ff690b1)
fd7ff690b1