Fixes from trash and others are acceptable. But not the ui level changes. Those changes should include in seperate merge
Fixes from trash and others are acceptable. But not the ui level changes. Those changes should include in seperate merge