Merge "[COMMON] Fix more and more array bashisms step 1"