Merge "Better emptying of trash bin"