diff --git a/BuildTasks/Common/Common.ts b/BuildTasks/Common/Common.ts
index 99c6ef0d..d77cc11a 100644
--- a/BuildTasks/Common/Common.ts
+++ b/BuildTasks/Common/Common.ts
@@ -486,13 +486,27 @@ function getTaskManifestPaths(manifestPath: string, manifest: object): string[]
         tl.debug(`Found task: ${task}`);
         const taskRoot: string = path.join(rootFolder, task);
         const rootManifest: string = path.join(taskRoot, "task.json");
+
+        let localizationRoot = tl.getInput("localizationRoot", false);
+        if (localizationRoot) {
+            localizationRoot = path.resolve(localizationRoot);
+        }
+
         if (tl.exist(rootManifest)) {
             tl.debug(`Found single-task manifest: ${rootManifest}`);
-            return (result).concat([rootManifest]);
+            let rootManifests: string[] = [rootManifest];
+            const rootLocManifest: string = path.join(localizationRoot || taskRoot, "task.loc.json");
+            if (tl.exist(rootLocManifest)) {
+                tl.debug(`Found localized single-task manifest: ${rootLocManifest}`);
+                rootManifests.push(rootLocManifest);
+            }
+            return (result).concat(rootManifests);
         } else {
             const versionManifests = tl.findMatch(taskRoot, "*/task.json");
+            const locVersionManifests = tl.findMatch(localizationRoot || taskRoot, "*/task.loc.json");
             tl.debug(`Found multi-task manifests: ${versionManifests.join(", ")}`);
-            return (result).concat(versionManifests);
+            tl.debug(`Found multi-task localized manifests: ${locVersionManifests.join(", ")}`);
+            return (result).concat(versionManifests).concat(locVersionManifests);
         }
     }, []);
 }
diff --git a/scripts/setTaskVersion.js b/scripts/setTaskVersion.js
index 3b284098..c2f5f231 100644
--- a/scripts/setTaskVersion.js
+++ b/scripts/setTaskVersion.js
@@ -24,14 +24,20 @@ console.log("Setting all task versions to: " + JSON.stringify(newVersion));
 var buildTasksDir = path.join(__dirname, "../BuildTasks");
 var buildTaskNames = getBuildTasks();
 buildTaskNames.forEach(function(name) {
-    var taskJsonFile = path.join(buildTasksDir, name, "task.json");
-    console.log("Updating: " + taskJsonFile);
-    if (fs.existsSync(taskJsonFile)) {
-        var task = jsonfile.readFileSync(taskJsonFile);
-
-        task["version"] = newVersion;
-
-        jsonfile.writeFileSync(taskJsonFile, task, {spaces: 2, EOL: '\r\n'});
-    }
+    var taskJsonFiles = [
+        path.join(buildTasksDir, name, "task.json"),
+        path.join(buildTasksDir, name, "task.loc.json")
+    ];
+
+    taskJsonFiles.forEach(function(taskJsonFile) {
+        console.log("Updating: " + taskJsonFile);
+        if (fs.existsSync(taskJsonFile)) {
+            var task = jsonfile.readFileSync(taskJsonFile);
+    
+            task["version"] = newVersion;
+    
+            jsonfile.writeFileSync(taskJsonFile, task, {spaces: 2, EOL: '\r\n'});
+        }
+    });
 });