AUI-1550

Squashed commits and updated HISTORY.md