Merge "Fix exit-time-destructor warning"