I believe mrvisser has submitted a UI PR for this