create history entries on the fly
cleanup history cleanups
Merge branch 'release/0.1.09'