Proposed UX improvement for #6