Merge "Remove support for OLD_HISTORY" into sc-dev