Ngan Phan

Results 2 issues of Ngan Phan

This PR fixes this issue #7250

This PR fixes issue #6114 I removed the separate check for default item and add it into the draggable list.

-PR: awaiting review