Images - Spaces in file name within Rich Text Editors

We've fixed this in an image field specifically, but Khy has found a similar issue with images inserted from File Manager within a Rich Text field.
When image has a space in the file name, the path is broken when the whole Rich Text field is rendered.