Sync to commit a21ea3f: [warning-fix][unused-local-var]

Upgrade patches:
  cmake/bump-version-number.patch
  warning/fix-unused-local-var.patch