3383631-button-ui-fix

Closes #3383631 for the 10.5.x branch.

Merge request reports

Loading