Merge "[COMMON] Fix more array bashisms"