[OE-4507] Allow spaces to be enterred into label text
Merge branch 'release/1.7' into develop