DEV-56715 - Text escapes text-configuration border when user uses no linebreaks or spaces
Merge remote-tracking branch 'origin/master'