Merge "[COMMON] Fix FUNCNAME bashisms"