Merge "[COMMON] Fix ${!name} bashisms"