Merge "[COMMON] Fix condition bracket bashisms - step 2"