Merge branch 'jc/history-message-prep-fix' into next

A write file stream resource leak has been fixed as part of a code cleanup. * jc/history-message-prep-fix: history: streamline message preparation and plug file stream leak