Merge "shell script fix using shellcheck lint"