Merge "[COMMON] Fix non-breaking spaces in shell scripts"