Merge branch 'topic/hist2'