None of us are getting out of this alive, anyway.
Merge branch 'Kris_Code' into develop