Merge "Fix FGS lifetime extender overzealousness"