BISERVER-8738 - Included UX team feedback