Merge "[COMMON] Get rid of "x-hack" in shell scripts"