### What problem does this PR solve? #5576, #6672 ### Type of change - [x] Documentation and UI Update