resource leak: Formatter was never closed
Merge remote-tracking branch: upstream/master