Merge branch 'features/history' into develop