Merge "Fix shellcheck warnings"