Merge "Part 2: Adding clear-all to history"