Merge "Fix shellcheck for scripts directory"