Merge "[COMMON] Fix condition equality bashisms"