Merge "[COMMON] Fix declare bashisms"