Fixes to end_of_life conditions
Merge pull request #1881 from anandpdoshi/anand-wip

Fixes to end_of_life conditions