Merge pull request #1926 from vhpoet/develop

[TASK] Roll back history api usage