v3.007-dev-new -> v3.008-dev-new merge. Contains fixes to ItemsHistory. PR is not yet ready for merge.

v3.007-dev-new -> v3.008-dev-new merge. Contains fixes to ItemsHistory. PR is not yet ready for merge. #3615