Merge "Reintroduced the clear all button" into lmp-dev