Merge branch 'jk/fast-import-history-bugfix'