Merge pull request #19348 from sunilpawar/dev_age_at_deceased_date