diff --git a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
index 70e1e68c40b..246a9d12d67 100644
--- a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
+++ b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
@@ -182,25 +182,6 @@ log4j.logger.com.amazonaws.http.AmazonHttpClient=ERROR
 #
 log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
 
-#
-# Job Summary Appender
-#
-# Use following logger to send summary to separate file defined by
-# hadoop.mapreduce.jobsummary.log.file :
-# hadoop.mapreduce.jobsummary.logger=INFO,JSA
-# 
-hadoop.mapreduce.jobsummary.logger=${hadoop.root.logger}
-hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
-hadoop.mapreduce.jobsummary.log.maxfilesize=256MB
-hadoop.mapreduce.jobsummary.log.maxbackupindex=20
-log4j.appender.JSA=org.apache.log4j.RollingFileAppender
-log4j.appender.JSA.File=${hadoop.log.dir}/${hadoop.mapreduce.jobsummary.log.file}
-log4j.appender.JSA.MaxFileSize=${hadoop.mapreduce.jobsummary.log.maxfilesize}
-log4j.appender.JSA.MaxBackupIndex=${hadoop.mapreduce.jobsummary.log.maxbackupindex}
-log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
-log4j.appender.JSA.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
-log4j.logger.org.apache.hadoop.mapred.JobInProgress$JobSummary=${hadoop.mapreduce.jobsummary.logger}
-log4j.additivity.org.apache.hadoop.mapred.JobInProgress$JobSummary=false
 
 #
 # shuffle connection log from shuffleHandler
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
index 5c879ecf414..67e86904563 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
@@ -740,6 +740,7 @@ public class CryptoInputStream extends FilterInputStream implements
     case StreamCapabilities.READAHEAD:
     case StreamCapabilities.DROPBEHIND:
     case StreamCapabilities.UNBUFFER:
+    case StreamCapabilities.READBYTEBUFFER:
       return true;
     default:
       return false;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
index 59d95cf49a8..99aa5d22bab 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
@@ -372,6 +372,12 @@ public abstract class ChecksumFileSystem extends FilterFileSystem {
         + "by ChecksumFileSystem");
   }
 
+  @Override
+  public void concat(final Path f, final Path[] psrcs) throws IOException {
+    throw new UnsupportedOperationException("Concat is not supported "
+        + "by ChecksumFileSystem");
+  }
+
   /**
    * Calculated the length of the checksum file in bytes.
    * @param size the length of the data file in bytes
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StreamCapabilities.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StreamCapabilities.java
index 3549cdc4fa3..c52d30762f0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StreamCapabilities.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StreamCapabilities.java
@@ -59,6 +59,12 @@ public interface StreamCapabilities {
    */
   String UNBUFFER = "in:unbuffer";
 
+  /**
+   * Stream read(ByteBuffer) capability implemented by
+   * {@link ByteBufferReadable#read(java.nio.ByteBuffer)}.
+   */
+  String READBYTEBUFFER = "in:readbytebuffer";
+
   /**
    * Capabilities that a stream can support and be queried for.
    */
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java
index 49cd600628b..e29cb9a4e0e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java
@@ -120,6 +120,12 @@ public class Trash extends Configured {
     trashPolicy.deleteCheckpoint();
   }
 
+  /** Delete all trash immediately. */
+  public void expungeImmediately() throws IOException {
+    trashPolicy.createCheckpoint();
+    trashPolicy.deleteCheckpointsImmediately();
+  }
+
   /** get the current working directory */
   Path getCurrentTrashDir() throws IOException {
     return trashPolicy.getCurrentTrashDir();
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
index 2fe3fd1a877..64fb81be99e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
@@ -79,6 +79,11 @@ public abstract class TrashPolicy extends Configured {
    */
   public abstract void deleteCheckpoint() throws IOException;
 
+  /**
+   * Delete all checkpoints immediately, ie empty trash.
+   */
+  public abstract void deleteCheckpointsImmediately() throws IOException;
+
   /**
    * Get the current working directory of the Trash Policy
    * This API does not work with files deleted from encryption zone when HDFS
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
index 39d5e73f0ba..9f07d3de1ee 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
@@ -213,11 +213,20 @@ public class TrashPolicyDefault extends TrashPolicy {
 
   @Override
   public void deleteCheckpoint() throws IOException {
+    deleteCheckpoint(false);
+  }
+
+  @Override
+  public void deleteCheckpointsImmediately() throws IOException {
+    deleteCheckpoint(true);
+  }
+
+  private void deleteCheckpoint(boolean deleteImmediately) throws IOException {
     Collection<FileStatus> trashRoots = fs.getTrashRoots(false);
     for (FileStatus trashRoot : trashRoots) {
       LOG.info("TrashPolicyDefault#deleteCheckpoint for trashRoot: " +
           trashRoot.getPath());
-      deleteCheckpoint(trashRoot.getPath());
+      deleteCheckpoint(trashRoot.getPath(), deleteImmediately);
     }
   }
 
@@ -283,7 +292,7 @@ public class TrashPolicyDefault extends TrashPolicy {
                 continue;
               try {
                 TrashPolicyDefault trash = new TrashPolicyDefault(fs, conf);
-                trash.deleteCheckpoint(trashRoot.getPath());
+                trash.deleteCheckpoint(trashRoot.getPath(), false);
                 trash.createCheckpoint(trashRoot.getPath(), new Date(now));
               } catch (IOException e) {
                 LOG.warn("Trash caught: "+e+". Skipping " +
@@ -341,7 +350,8 @@ public class TrashPolicyDefault extends TrashPolicy {
     }
   }
 
-  private void deleteCheckpoint(Path trashRoot) throws IOException {
+  private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately)
+      throws IOException {
     LOG.info("TrashPolicyDefault#deleteCheckpoint for trashRoot: " + trashRoot);
 
     FileStatus[] dirs = null;
@@ -368,7 +378,7 @@ public class TrashPolicyDefault extends TrashPolicy {
         continue;
       }
 
-      if ((now - deletionInterval) > time) {
+      if (((now - deletionInterval) > time) || deleteImmediately) {
         if (fs.delete(path, true)) {
           LOG.info("Deleted trash checkpoint: "+dir);
         } else {
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index a0663950159..57b543acc21 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -219,16 +219,20 @@ class Delete {
   // than the retention threshold.
   static class Expunge extends FsCommand {
     public static final String NAME = "expunge";
-    public static final String USAGE = "";
+    public static final String USAGE =
+        "[-immediate]";
     public static final String DESCRIPTION =
         "Delete files from the trash that are older " +
             "than the retention threshold";
 
+    private boolean emptyImmediately = false;
+
     // TODO: should probably allow path arguments for the filesystems
     @Override
     protected void processOptions(LinkedList<String> args) throws IOException {
-      CommandFormat cf = new CommandFormat(0, 0);
+      CommandFormat cf = new CommandFormat(0, 1, "immediate");
       cf.parse(args);
+      emptyImmediately = cf.getOpt("immediate");
     }
 
     @Override
@@ -239,14 +243,23 @@ class Delete {
       if (null != childFileSystems) {
         for (FileSystem fs : childFileSystems) {
           Trash trash = new Trash(fs, getConf());
-          trash.expunge();
-          trash.checkpoint();
+          if (emptyImmediately) {
+            trash.expungeImmediately();
+          } else {
+            trash.expunge();
+            trash.checkpoint();
+          }
         }
       } else {
         Trash trash = new Trash(getConf());
-        trash.expunge();
-        trash.checkpoint();
+        if (emptyImmediately) {
+          trash.expungeImmediately();
+        } else {
+          trash.expunge();
+          trash.checkpoint();
+        }
       }
     }
   }
+
 }
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index bd2ff7b43aa..0e9ea047453 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -288,8 +288,10 @@ public class NetUtils {
     if (fqHost == null) {
       try {
         fqHost = SecurityUtil.getByName(host).getHostName();
-        // slight race condition, but won't hurt
         canonicalizedHostCache.putIfAbsent(host, fqHost);
+        // ensures that we won't return a canonicalized stale (non-cached)
+        // host name for a given host
+        fqHost = canonicalizedHostCache.get(host);
       } catch (UnknownHostException e) {
         fqHost = host;
       }
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java
index cf1e46053a8..7c46c5b7ec4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java
@@ -249,7 +249,7 @@ public class NodeHealthScriptRunner extends AbstractService {
   }
 
   /**
-   * Sets if the node is healhty or not considering disks' health also.
+   * Sets if the node is healthy or not considering disks' health also.
    * 
    * @param isHealthy
    *          if or not node is healthy
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
index d9567b9a9da..f4a37ea0366 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
@@ -264,7 +264,7 @@ Displays a summary of file lengths.
 expunge
 -------
 
-Usage: `hadoop fs -expunge`
+Usage: `hadoop fs -expunge [-immediate]`
 
 Permanently delete files in checkpoints older than the retention threshold
 from trash directory, and create new checkpoint.
@@ -279,6 +279,9 @@ users can configure to create and delete checkpoints periodically
 by the parameter stored as `fs.trash.checkpoint.interval` (in core-site.xml).
 This value should be smaller or equal to `fs.trash.interval`.
 
+If the `-immediate` option is passed, all files in the trash for the current
+user are immediately deleted, ignoring the `fs.trash.interval` setting.
+
 Refer to the
 [HDFS Architecture guide](../hadoop-hdfs/HdfsDesign.html#File_Deletes_and_Undeletes)
 for more information about trash feature of HDFS.
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
index 04f56fb0754..cf22f3b10b5 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
@@ -36,6 +36,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import static org.junit.Assert.*;
 
 import org.apache.hadoop.conf.Configuration;
@@ -486,6 +488,41 @@ public class TestTrash {
           trashRootFs.exists(dirToKeep));
     }
 
+    // Verify expunge -immediate removes all checkpoints and current folder
+    {
+      // Setup a recent and old checkpoint and a current folder
+      // to be deleted on the next expunge and one that isn't.
+      long trashInterval = conf.getLong(FS_TRASH_INTERVAL_KEY,
+          FS_TRASH_INTERVAL_DEFAULT);
+      long now = Time.now();
+      DateFormat checkpointFormat = new SimpleDateFormat("yyMMddHHmm");
+      Path oldCheckpoint = new Path(trashRoot.getParent(),
+          checkpointFormat.format(now - (trashInterval * 60 * 1000) - 1));
+      Path recentCheckpoint = new Path(trashRoot.getParent(),
+          checkpointFormat.format(now));
+      Path currentFolder = new Path(trashRoot.getParent(), "Current");
+      mkdir(trashRootFs, oldCheckpoint);
+      mkdir(trashRootFs, recentCheckpoint);
+      mkdir(trashRootFs, currentFolder);
+
+      // Clear out trash
+      int rc = -1;
+      try {
+        rc = shell.run(new String[] {"-expunge", "-immediate"});
+      } catch (Exception e) {
+        fail("Unexpected exception running the trash shell: " +
+            e.getLocalizedMessage());
+      }
+      assertEquals("Expunge immediate should return zero", 0, rc);
+      assertFalse("Old checkpoint should be removed",
+          trashRootFs.exists(oldCheckpoint));
+      assertFalse("Recent checkpoint should be removed",
+          trashRootFs.exists(recentCheckpoint));
+      assertFalse("Current folder should be removed",
+          trashRootFs.exists(currentFolder));
+      assertEquals("Ensure trash folder is empty",
+          trashRootFs.listStatus(trashRoot.getParent()).length, 0);
+    }
   }
 
   public static void trashNonDefaultFS(Configuration conf) throws IOException {
@@ -1000,6 +1037,10 @@ public class TestTrash {
     public void deleteCheckpoint() throws IOException {
     }
 
+    @Override
+    public void deleteCheckpointsImmediately() throws IOException {
+    }
+
     @Override
     public Path getCurrentTrashDir() {
       return null;
@@ -1059,6 +1100,11 @@ public class TestTrash {
       AuditableCheckpoints.delete();
     }
 
+    @Override
+    public void deleteCheckpointsImmediately() throws IOException {
+      AuditableCheckpoints.deleteAll();
+    }
+
     @Override
     public Path getCurrentTrashDir() {
       return null;
@@ -1115,25 +1161,32 @@ public class TestTrash {
    */
   private static class AuditableCheckpoints {
 
+    private static final Logger LOG =
+        LoggerFactory.getLogger(AuditableCheckpoints.class);
+
     private static AtomicInteger numOfCheckpoint =
         new AtomicInteger(0);
 
     private static void add() {
       numOfCheckpoint.incrementAndGet();
-      System.out.println(String
-          .format("Create a checkpoint, current number of checkpoints %d",
-              numOfCheckpoint.get()));
+      LOG.info("Create a checkpoint, current number of checkpoints {}",
+          numOfCheckpoint.get());
     }
 
     private static void delete() {
       if(numOfCheckpoint.get() > 0) {
         numOfCheckpoint.decrementAndGet();
-        System.out.println(String
-            .format("Delete a checkpoint, current number of checkpoints %d",
-                numOfCheckpoint.get()));
+        LOG.info("Delete a checkpoint, current number of checkpoints {}",
+            numOfCheckpoint.get());
       }
     }
 
+    private static void deleteAll() {
+      numOfCheckpoint.set(0);
+      LOG.info("Delete all checkpoints, current number of checkpoints {}",
+          numOfCheckpoint.get());
+    }
+
     private static int get() {
       return numOfCheckpoint.get();
     }
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
index 6e27964d8e3..f675ddfa0db 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.fs.contract.localfs;
 
+import org.junit.Assume;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractMultipartUploaderTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
@@ -27,6 +29,12 @@ import org.apache.hadoop.fs.contract.AbstractFSContract;
 public class TestLocalFSContractMultipartUploader
     extends AbstractContractMultipartUploaderTest {
 
+  @Override
+  public void setup() throws Exception {
+    Assume.assumeTrue("Skipping until HDFS-13934", false);
+    super.setup();
+  }
+
   @Override
   protected AbstractFSContract createContract(Configuration conf) {
     return new LocalFSContract(conf);
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
index d68f4e210d1..0082452e514 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
+import java.util.Enumeration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -191,6 +192,14 @@ public abstract class GenericTestUtils {
     setLogLevel(LogManager.getRootLogger(), Level.toLevel(level.toString()));
   }
 
+  public static void setCurrentLoggersLogLevel(org.slf4j.event.Level level) {
+    for (Enumeration<?> loggers = LogManager.getCurrentLoggers();
+        loggers.hasMoreElements();) {
+      Logger logger = (Logger) loggers.nextElement();
+      logger.setLevel(Level.toLevel(level.toString()));
+    }
+  }
+
   public static org.slf4j.event.Level toLevel(String level) {
     return toLevel(level, org.slf4j.event.Level.DEBUG);
   }
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
index 52f8b9f6ef2..c14b3cb145b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
@@ -19,138 +19,148 @@
 package org.apache.hadoop.util;
 
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.util.LineReader;
+import org.junit.Assert;
 import org.junit.Test;
 
-import org.junit.Assert;
-
 public class TestLineReader {
-  private LineReader lineReader;
-  private String TestData;
-  private String Delimiter;
-  private Text line;
 
+  /**
+   * TEST_1: The test scenario is the tail of the buffer equals the starting
+   * character/s of delimiter.
+   *
+   * The Test Data is such that,
+   *
+   * 1) we will have "&lt;/entity&gt;" as delimiter
+   *
+   * 2) The tail of the current buffer would be "&lt;/" which matches with the
+   * starting character sequence of delimiter.
+   *
+   * 3) The Head of the next buffer would be "id&gt;" which does NOT match with
+   * the remaining characters of delimiter.
+   *
+   * 4) Input data would be prefixed by char 'a' about
+   * numberOfCharToFillTheBuffer times. So that, one iteration to buffer the
+   * input data, would end at '&lt;/' ie equals starting 2 char of delimiter
+   *
+   * 5) For this we would take BufferSize as 64 * 1024;
+   *
+   * Check Condition In the second key value pair, the value should contain
+   * "&lt;/" from currentToken and "id&gt;" from next token
+   */
   @Test
-  public void testCustomDelimiter() throws Exception {
-    /* TEST_1
-     * The test scenario is the tail of the buffer
-     * equals the starting character/s of delimiter
-     * 
-     * The Test Data is such that,
-     *   
-     * 1) we will have "</entity>" as delimiter  
-     *  
-     * 2) The tail of the current buffer would be "</"
-     *    which matches with the starting character sequence of delimiter.
-     *    
-     * 3) The Head of the next buffer would be   "id>" 
-     *    which does NOT match with the remaining characters of delimiter.
-     *   
-     * 4) Input data would be prefixed by char 'a' 
-     *    about numberOfCharToFillTheBuffer times.
-     *    So that, one iteration to buffer the input data,
-     *    would end at '</' ie equals starting 2 char of delimiter  
-     *     
-     * 5) For this we would take BufferSize as 64 * 1024;
-     * 
-     * Check Condition
-     *  In the second key value pair, the value should contain 
-     *  "</"  from currentToken and
-     *  "id>" from next token
-     */  
-    
-    Delimiter="</entity>"; 
-    
-    String CurrentBufferTailToken=
-        "</entity><entity><id>Gelesh</";
-    // Ending part of Input Data Buffer
-    // It contains '</' ie delimiter character 
-    
-    String NextBufferHeadToken=
-        "id><name>Omathil</name></entity>";
-    // Supposing the start of next buffer is this
-    
-    String Expected = 
-        (CurrentBufferTailToken+NextBufferHeadToken)
-        .replace(Delimiter, "");                       
-    // Expected ,must capture from both the buffer, excluding Delimiter
-  
-    String TestPartOfInput = CurrentBufferTailToken+NextBufferHeadToken;
-  
-    int BufferSize=64 * 1024;
-    int numberOfCharToFillTheBuffer =
-            BufferSize - CurrentBufferTailToken.length();
-    StringBuilder fillerString=new StringBuilder();
-    for (int i=0; i<numberOfCharToFillTheBuffer; i++) {
-      fillerString.append('a'); // char 'a' as a filler for the test string
-    }
+  public void testCustomDelimiter1() throws Exception {
 
-    TestData = fillerString + TestPartOfInput;
-    lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
-    
-    line = new Text();
-    
+    final String delimiter = "</entity>";
+
+    // Ending part of Input Data Buffer
+    // It contains '</' ie delimiter character
+    final String currentBufferTailToken = "</entity><entity><id>Gelesh</";
+
+    // Supposing the start of next buffer is this
+    final String nextBufferHeadToken = "id><name>Omathil</name></entity>";
+
+    // Expected must capture from both the buffer, excluding Delimiter
+    final String expected =
+        (currentBufferTailToken + nextBufferHeadToken).replace(delimiter, "");
+
+    final String testPartOfInput = currentBufferTailToken + nextBufferHeadToken;
+
+    final int bufferSize = 64 * 1024;
+    int numberOfCharToFillTheBuffer =
+        bufferSize - currentBufferTailToken.length();
+
+    final char[] fillBuffer = new char[numberOfCharToFillTheBuffer];
+
+    // char 'a' as a filler for the test string
+    Arrays.fill(fillBuffer, 'a');
+
+    final StringBuilder fillerString = new StringBuilder();
+
+    final String testData = fillerString + testPartOfInput;
+
+    final LineReader lineReader = new LineReader(
+        new ByteArrayInputStream(testData.getBytes(StandardCharsets.UTF_8)),
+        delimiter.getBytes(StandardCharsets.UTF_8));
+
+    final Text line = new Text();
     lineReader.readLine(line);
+    lineReader.close();
+
     Assert.assertEquals(fillerString.toString(), line.toString());
-    
+
     lineReader.readLine(line);
-    Assert.assertEquals(Expected, line.toString());
-    
-    /*TEST_2
-     * The test scenario is such that,
-     * the character/s preceding the delimiter,
-     * equals the starting character/s of delimiter
-     */
-    
-    Delimiter = "record";
-    StringBuilder TestStringBuilder = new StringBuilder();
-    
-    TestStringBuilder.append(Delimiter + "Kerala ");
-    TestStringBuilder.append(Delimiter + "Bangalore");
-    TestStringBuilder.append(Delimiter + " North Korea");
-    TestStringBuilder.append(Delimiter + Delimiter+
-                        "Guantanamo");
-    TestStringBuilder.append(Delimiter + "ecord"
-            + "recor" + "core"); //~EOF with 're'
-    
-    TestData=TestStringBuilder.toString();
-    
-    lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
+    Assert.assertEquals(expected, line.toString());
+  }
+
+  /**
+   * TEST_2: The test scenario is such that, the character/s preceding the
+   * delimiter, equals the starting character/s of delimiter.
+   */
+  @Test
+  public void testCustomDelimiter2() throws Exception {
+    final String delimiter = "record";
+    final StringBuilder testStringBuilder = new StringBuilder();
+
+    testStringBuilder.append(delimiter).append("Kerala ");
+    testStringBuilder.append(delimiter).append("Bangalore");
+    testStringBuilder.append(delimiter).append(" North Korea");
+    testStringBuilder.append(delimiter).append(delimiter).append("Guantanamo");
+
+    // ~EOF with 're'
+    testStringBuilder.append(delimiter + "ecord" + "recor" + "core");
+
+    final String testData = testStringBuilder.toString();
+
+    final LineReader lineReader = new LineReader(
+        new ByteArrayInputStream(testData.getBytes(StandardCharsets.UTF_8)),
+        delimiter.getBytes((StandardCharsets.UTF_8)));
+
+    final Text line = new Text();
 
     lineReader.readLine(line);
     Assert.assertEquals("", line.toString());
     lineReader.readLine(line);
     Assert.assertEquals("Kerala ", line.toString());
-    
-    lineReader.readLine(line); 
-    Assert.assertEquals("Bangalore", line.toString());
-    
-    lineReader.readLine(line); 
-    Assert.assertEquals(" North Korea", line.toString());
-    
-    lineReader.readLine(line); 
-    Assert.assertEquals("", line.toString());
-    lineReader.readLine(line); 
-    Assert.assertEquals("Guantanamo", line.toString());
-    
-    lineReader.readLine(line); 
-    Assert.assertEquals(("ecord"+"recor"+"core"), line.toString());
 
-    // Test 3
-    // The test scenario is such that,
-    // aaaabccc split by aaab
-    TestData = "aaaabccc";
-    Delimiter = "aaab";
-    lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
+    lineReader.readLine(line);
+    Assert.assertEquals("Bangalore", line.toString());
+
+    lineReader.readLine(line);
+    Assert.assertEquals(" North Korea", line.toString());
+
+    lineReader.readLine(line);
+    Assert.assertEquals("", line.toString());
+    lineReader.readLine(line);
+    Assert.assertEquals("Guantanamo", line.toString());
+
+    lineReader.readLine(line);
+    Assert.assertEquals(("ecord" + "recor" + "core"), line.toString());
+
+    lineReader.close();
+  }
+
+  /**
+   * Test 3: The test scenario is such that, aaabccc split by aaab.
+   */
+  @Test
+  public void testCustomDelimiter3() throws Exception {
+    final String testData = "aaaabccc";
+    final String delimiter = "aaab";
+    final LineReader lineReader = new LineReader(
+        new ByteArrayInputStream(testData.getBytes(StandardCharsets.UTF_8)),
+        delimiter.getBytes(StandardCharsets.UTF_8));
+
+    final Text line = new Text();
 
     lineReader.readLine(line);
     Assert.assertEquals("a", line.toString());
     lineReader.readLine(line);
     Assert.assertEquals("ccc", line.toString());
+
+    lineReader.close();
   }
 }
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index ddcf9667c53..c068046aac7 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -214,14 +214,14 @@ public class XceiverClientGrpc extends XceiverClientSpi {
 
   @Override
   public XceiverClientReply sendCommand(
-      ContainerCommandRequestProto request, List<UUID> excludeDns)
+      ContainerCommandRequestProto request, List<DatanodeDetails> excludeDns)
       throws IOException {
     Preconditions.checkState(HddsUtils.isReadOnly(request));
     return sendCommandWithRetry(request, excludeDns);
   }
 
   private XceiverClientReply sendCommandWithRetry(
-      ContainerCommandRequestProto request, List<UUID> excludeDns)
+      ContainerCommandRequestProto request, List<DatanodeDetails> excludeDns)
       throws IOException {
     ContainerCommandResponseProto responseProto = null;
 
@@ -231,24 +231,24 @@ public class XceiverClientGrpc extends XceiverClientSpi {
     // TODO: cache the correct leader info in here, so that any subsequent calls
     // should first go to leader
     List<DatanodeDetails> dns = pipeline.getNodes();
-    DatanodeDetails datanode = null;
     List<DatanodeDetails> healthyDns =
         excludeDns != null ? dns.stream().filter(dnId -> {
-          for (UUID excludeId : excludeDns) {
-            if (dnId.getUuid().equals(excludeId)) {
+          for (DatanodeDetails excludeId : excludeDns) {
+            if (dnId.equals(excludeId)) {
               return false;
             }
           }
           return true;
         }).collect(Collectors.toList()) : dns;
+    XceiverClientReply reply = new XceiverClientReply(null);
     for (DatanodeDetails dn : healthyDns) {
       try {
         LOG.debug("Executing command " + request + " on datanode " + dn);
         // In case the command gets retried on a 2nd datanode,
         // sendCommandAsyncCall will create a new channel and async stub
         // in case these don't exist for the specific datanode.
+        reply.addDatanode(dn);
         responseProto = sendCommandAsync(request, dn).getResponse().get();
-        datanode = dn;
         if (responseProto.getResult() == ContainerProtos.Result.SUCCESS) {
           break;
         }
@@ -264,8 +264,8 @@ public class XceiverClientGrpc extends XceiverClientSpi {
     }
 
     if (responseProto != null) {
-      return new XceiverClientReply(
-          CompletableFuture.completedFuture(responseProto), datanode.getUuid());
+      reply.setResponse(CompletableFuture.completedFuture(responseProto));
+      return reply;
     } else {
       throw new IOException(
           "Failed to execute command " + request + " on the pipeline "
@@ -382,11 +382,11 @@ public class XceiverClientGrpc extends XceiverClientSpi {
   }
 
   @Override
-  public long watchForCommit(long index, long timeout)
+  public XceiverClientReply watchForCommit(long index, long timeout)
       throws InterruptedException, ExecutionException, TimeoutException,
       IOException {
     // there is no notion of watch for commit index in standalone pipeline
-    return 0;
+    return null;
   };
 
   public long getReplicatedMinCommitIndex() {
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
index 0caf10d2af1..673a82bbd82 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.hdds.scm;
 
-import com.google.common.base.Preconditions;
 import org.apache.hadoop.hdds.HddsUtils;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 
@@ -59,6 +59,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * An abstract implementation of {@link XceiverClientSpi} using Ratis.
@@ -91,7 +92,7 @@ public final class XceiverClientRatis extends XceiverClientSpi {
   private final GrpcTlsConfig tlsConfig;
 
   // Map to track commit index at every server
-  private final ConcurrentHashMap<String, Long> commitInfoMap;
+  private final ConcurrentHashMap<UUID, Long> commitInfoMap;
 
   // create a separate RaftClient for watchForCommit API
   private RaftClient watchClient;
@@ -118,7 +119,8 @@ public final class XceiverClientRatis extends XceiverClientSpi {
     // of the servers
     if (commitInfoMap.isEmpty()) {
       commitInfoProtos.forEach(proto -> commitInfoMap
-          .put(proto.getServer().getAddress(), proto.getCommitIndex()));
+          .put(RatisHelper.toDatanodeId(proto.getServer()),
+              proto.getCommitIndex()));
       // In case the commit is happening 2 way, just update the commitIndex
       // for the servers which have been successfully updating the commit
       // indexes. This is important because getReplicatedMinCommitIndex()
@@ -126,7 +128,7 @@ public final class XceiverClientRatis extends XceiverClientSpi {
       // been replicating data successfully.
     } else {
       commitInfoProtos.forEach(proto -> commitInfoMap
-          .computeIfPresent(proto.getServer().getAddress(),
+          .computeIfPresent(RatisHelper.toDatanodeId(proto.getServer()),
               (address, index) -> {
                 index = proto.getCommitIndex();
                 return index;
@@ -218,15 +220,23 @@ public final class XceiverClientRatis extends XceiverClientSpi {
     return minIndex.isPresent() ? minIndex.getAsLong() : 0;
   }
 
+  private void addDatanodetoReply(UUID address, XceiverClientReply reply) {
+    DatanodeDetails.Builder builder = DatanodeDetails.newBuilder();
+    builder.setUuid(address.toString());
+    reply.addDatanode(builder.build());
+  }
+
   @Override
-  public long watchForCommit(long index, long timeout)
+  public XceiverClientReply watchForCommit(long index, long timeout)
       throws InterruptedException, ExecutionException, TimeoutException,
       IOException {
     long commitIndex = getReplicatedMinCommitIndex();
+    XceiverClientReply clientReply = new XceiverClientReply(null);
     if (commitIndex >= index) {
       // return the min commit index till which the log has been replicated to
       // all servers
-      return commitIndex;
+      clientReply.setLogIndex(commitIndex);
+      return clientReply;
     }
     LOG.debug("commit index : {} watch timeout : {}", index, timeout);
     // create a new RaftClient instance for watch request
@@ -250,26 +260,30 @@ public final class XceiverClientRatis extends XceiverClientSpi {
       // TODO : need to remove the code to create the new RaftClient instance
       // here once the watch request bypassing sliding window in Raft Client
       // gets fixed.
-      watchClient =
-          RatisHelper.newRaftClient(rpcType, getPipeline(), retryPolicy,
+      watchClient = RatisHelper
+          .newRaftClient(rpcType, getPipeline(), retryPolicy,
               maxOutstandingRequests, tlsConfig);
       reply = watchClient
           .sendWatchAsync(index, RaftProtos.ReplicationLevel.MAJORITY_COMMITTED)
           .get(timeout, TimeUnit.MILLISECONDS);
-      Optional<RaftProtos.CommitInfoProto>
-          proto = reply.getCommitInfos().stream().min(Comparator.comparing(
-          RaftProtos.CommitInfoProto :: getCommitIndex));
-      Preconditions.checkState(proto.isPresent());
-      String address = proto.get().getServer().getAddress();
-      // since 3 way commit has failed, the updated map from now on  will
-      // only store entries for those datanodes which have had successful
-      // replication.
-      commitInfoMap.remove(address);
-      LOG.info(
-          "Could not commit " + index + " to all the nodes. Server " + address
-              + " has failed." + " Committed by majority.");
+      List<RaftProtos.CommitInfoProto> commitInfoProtoList =
+          reply.getCommitInfos().stream()
+              .filter(i -> i.getCommitIndex() < index)
+              .collect(Collectors.toList());
+      commitInfoProtoList.parallelStream().forEach(proto -> {
+        UUID address = RatisHelper.toDatanodeId(proto.getServer());
+        addDatanodetoReply(address, clientReply);
+        // since 3 way commit has failed, the updated map from now on  will
+        // only store entries for those datanodes which have had successful
+        // replication.
+        commitInfoMap.remove(address);
+        LOG.info(
+            "Could not commit " + index + " to all the nodes. Server " + address
+                + " has failed." + " Committed by majority.");
+      });
     }
-    return index;
+    clientReply.setLogIndex(index);
+    return clientReply;
   }
 
   /**
@@ -296,17 +310,28 @@ public final class XceiverClientRatis extends XceiverClientSpi {
                 RaftRetryFailureException raftRetryFailureException =
                     reply.getRetryFailureException();
                 if (raftRetryFailureException != null) {
+                  // in case of raft retry failure, the raft client is
+                  // not able to connect to the leader hence the pipeline
+                  // can not be used but this instance of RaftClient will close
+                  // and refreshed again. In case the client cannot connect to
+                   // leader, getClient call will fail.
+
+                  // No need to set the failed Server ID here. Ozone client
+                  // will directly exclude this pipeline in next allocate block
+                  // to SCM as in this case, it is the raft client which is not
+                  // able to connect to leader in the pipeline, though the
+                  // pipeline can still be functional.
                   throw new CompletionException(raftRetryFailureException);
                 }
                 ContainerCommandResponseProto response =
                     ContainerCommandResponseProto
                         .parseFrom(reply.getMessage().getContent());
+                UUID serverId = RatisHelper.toDatanodeId(reply.getReplierId());
                 if (response.getResult() == ContainerProtos.Result.SUCCESS) {
                   updateCommitInfosMap(reply.getCommitInfos());
-                  asyncReply.setLogIndex(reply.getLogIndex());
-                  asyncReply.setDatanode(
-                      RatisHelper.toDatanodeId(reply.getReplierId()));
                 }
+                asyncReply.setLogIndex(reply.getLogIndex());
+                addDatanodetoReply(serverId, asyncReply);
                 return response;
               } catch (InvalidProtocolBufferException e) {
                 throw new CompletionException(e);
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index 3ea36d45dc5..66671637bfa 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -42,7 +42,6 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -290,7 +289,7 @@ public class BlockInputStream extends InputStream implements Seekable {
     XceiverClientReply reply;
     ReadChunkResponseProto readChunkResponse = null;
     final ChunkInfo chunkInfo = chunks.get(chunkIndex);
-    List<UUID> excludeDns = null;
+    List<DatanodeDetails> excludeDns = null;
     ByteString byteString;
     List<DatanodeDetails> dnList = xceiverClient.getPipeline().getNodes();
     while (true) {
@@ -334,7 +333,7 @@ public class BlockInputStream extends InputStream implements Seekable {
         if (excludeDns == null) {
           excludeDns = new ArrayList<>();
         }
-        excludeDns.add(reply.getDatanode());
+        excludeDns.addAll(reply.getDatanodes());
         if (excludeDns.size() == dnList.size()) {
           throw ioe;
         }
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
index f3ba6564264..2e156b3f5bf 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hdds.scm.storage;
 import com.google.common.base.Preconditions;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
 import org.apache.hadoop.hdds.scm.XceiverClientReply;
 import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
@@ -41,6 +42,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
+import java.util.Collections;
 import java.util.UUID;
 import java.util.List;
 import java.util.ArrayList;
@@ -102,14 +104,17 @@ public class BlockOutputStream extends OutputStream {
   // by all servers
   private long totalAckDataLength;
 
-  // list to hold up all putBlock futures
-  private List<CompletableFuture<ContainerProtos.ContainerCommandResponseProto>>
-      futureList;
+  // future Map to hold up all putBlock futures
+  private ConcurrentHashMap<Long,
+      CompletableFuture<ContainerProtos.ContainerCommandResponseProto>>
+      futureMap;
   // map containing mapping for putBlock logIndex to to flushedDataLength Map.
   private ConcurrentHashMap<Long, Long> commitIndex2flushedDataMap;
 
   private int currentBufferIndex;
 
+  private List<DatanodeDetails> failedServers;
+
   /**
    * Creates a new BlockOutputStream.
    *
@@ -157,10 +162,11 @@ public class BlockOutputStream extends OutputStream {
     responseExecutor = Executors.newSingleThreadExecutor();
     commitIndex2flushedDataMap = new ConcurrentHashMap<>();
     totalAckDataLength = 0;
-    futureList = new ArrayList<>();
+    futureMap = new ConcurrentHashMap<>();
     totalDataFlushedLength = 0;
     currentBufferIndex = 0;
     writtenDataLength = 0;
+    failedServers = Collections.emptyList();
   }
 
   public BlockID getBlockID() {
@@ -182,6 +188,9 @@ public class BlockOutputStream extends OutputStream {
     return dataLength;
   }
 
+  public List<DatanodeDetails> getFailedServers() {
+    return failedServers;
+  }
 
   @Override
   public void write(int b) throws IOException {
@@ -299,7 +308,7 @@ public class BlockOutputStream extends OutputStream {
       Preconditions.checkState(commitIndex2flushedDataMap.containsKey(index));
       totalAckDataLength = commitIndex2flushedDataMap.remove(index);
       LOG.debug("Total data successfully replicated: " + totalAckDataLength);
-      futureList.remove(0);
+      futureMap.remove(totalAckDataLength);
       // Flush has been committed to required servers successful.
       // just swap the bufferList head and tail after clearing.
       ByteBuffer currentBuffer = bufferList.remove(0);
@@ -320,7 +329,7 @@ public class BlockOutputStream extends OutputStream {
   private void handleFullBuffer() throws IOException {
     try {
       checkOpen();
-      if (!futureList.isEmpty()) {
+      if (!futureMap.isEmpty()) {
         waitOnFlushFutures();
       }
     } catch (InterruptedException | ExecutionException e) {
@@ -362,9 +371,22 @@ public class BlockOutputStream extends OutputStream {
   private void watchForCommit(long commitIndex) throws IOException {
     checkOpen();
     Preconditions.checkState(!commitIndex2flushedDataMap.isEmpty());
+    long index;
     try {
-      long index =
+      XceiverClientReply reply =
           xceiverClient.watchForCommit(commitIndex, watchTimeout);
+      if (reply == null) {
+        index = 0;
+      } else {
+        List<DatanodeDetails> dnList = reply.getDatanodes();
+        if (!dnList.isEmpty()) {
+          if (failedServers.isEmpty()) {
+            failedServers = new ArrayList<>();
+          }
+          failedServers.addAll(dnList);
+        }
+        index = reply.getLogIndex();
+      }
       adjustBuffers(index);
     } catch (TimeoutException | InterruptedException | ExecutionException e) {
       LOG.warn("watchForCommit failed for index " + commitIndex, e);
@@ -392,8 +414,7 @@ public class BlockOutputStream extends OutputStream {
         try {
           validateResponse(e);
         } catch (IOException sce) {
-          future.completeExceptionally(sce);
-          return e;
+          throw new CompletionException(sce);
         }
         // if the ioException is not set, putBlock is successful
         if (ioException == null) {
@@ -422,7 +443,7 @@ public class BlockOutputStream extends OutputStream {
       throw new IOException(
           "Unexpected Storage Container Exception: " + e.toString(), e);
     }
-    futureList.add(flushFuture);
+    futureMap.put(flushPos, flushFuture);
     return flushFuture;
   }
 
@@ -516,8 +537,8 @@ public class BlockOutputStream extends OutputStream {
 
   private void waitOnFlushFutures()
       throws InterruptedException, ExecutionException {
-    CompletableFuture<Void> combinedFuture = CompletableFuture
-        .allOf(futureList.toArray(new CompletableFuture[futureList.size()]));
+    CompletableFuture<Void> combinedFuture = CompletableFuture.allOf(
+        futureMap.values().toArray(new CompletableFuture[futureMap.size()]));
     // wait for all the transactions to complete
     combinedFuture.get();
   }
@@ -553,10 +574,10 @@ public class BlockOutputStream extends OutputStream {
     }
     xceiverClientManager = null;
     xceiverClient = null;
-    if (futureList != null) {
-      futureList.clear();
+    if (futureMap != null) {
+      futureMap.clear();
     }
-    futureList = null;
+    futureMap = null;
     if (commitIndex2flushedDataMap != null) {
       commitIndex2flushedDataMap.clear();
     }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index 007104f7563..5df4b026491 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -17,6 +17,9 @@
 package org.apache.hadoop.hdds;
 
 import org.apache.hadoop.utils.db.DBProfile;
+import org.apache.ratis.util.TimeDuration;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * This class contains constants for configuration keys and default values
@@ -70,6 +73,14 @@ public final class HddsConfigKeys {
       "hdds.scm.chillmode.min.datanode";
   public static final int HDDS_SCM_CHILLMODE_MIN_DATANODE_DEFAULT = 1;
 
+
+  public static final String
+      HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT =
+      "hdds.scm.wait.time.after.chillmode.exit";
+
+  public static final String
+      HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT_DEFAULT = "5m";
+
   public static final String HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK =
       "hdds.scm.chillmode.pipeline-availability.check";
   public static final boolean
@@ -89,6 +100,11 @@ public final class HddsConfigKeys {
   public static final double
       HDDS_SCM_CHILLMODE_HEALTHY_PIPELINE_THRESHOLD_PCT_DEFAULT = 0.10;
 
+  public static final String HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT =
+      "hdds.scm.chillmode.atleast.one.node.reported.pipeline.pct";
+  public static final double
+      HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT_DEFAULT = 0.90;
+
   public static final String HDDS_LOCK_MAX_CONCURRENCY =
       "hdds.lock.max.concurrency";
   public static final int HDDS_LOCK_MAX_CONCURRENCY_DEFAULT = 100;
@@ -222,4 +238,24 @@ public final class HddsConfigKeys {
   public static final String HDDS_SECURITY_CLIENT_SCM_CERTIFICATE_PROTOCOL_ACL =
       "hdds.security.client.scm.certificate.protocol.acl";
 
+  public static final String HDDS_DATANODE_HTTP_ENABLED_KEY =
+      "hdds.datanode.http.enabled";
+  public static final String HDDS_DATANODE_HTTP_BIND_HOST_KEY =
+      "hdds.datanode.http-bind-host";
+  public static final String HDDS_DATANODE_HTTPS_BIND_HOST_KEY =
+      "hdds.datanode.https-bind-host";
+  public static final String HDDS_DATANODE_HTTP_ADDRESS_KEY =
+      "hdds.datanode.http-address";
+  public static final String HDDS_DATANODE_HTTPS_ADDRESS_KEY =
+      "hdds.datanode.https-address";
+
+  public static final String HDDS_DATANODE_HTTP_BIND_HOST_DEFAULT = "0.0.0.0";
+  public static final int HDDS_DATANODE_HTTP_BIND_PORT_DEFAULT = 9882;
+  public static final int HDDS_DATANODE_HTTPS_BIND_PORT_DEFAULT = 9883;
+  public static final String
+      HDDS_DATANODE_HTTP_KERBEROS_PRINCIPAL_KEY =
+      "hdds.datanode.http.kerberos.principal";
+  public static final String
+      HDDS_DATANODE_HTTP_KERBEROS_KEYTAB_FILE_KEY =
+      "hdds.datanode.http.kerberos.keytab";
 }
\ No newline at end of file
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
index 1556a575679..2ca42d5a0d3 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hdds;
 
 import javax.management.ObjectName;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
@@ -36,7 +37,15 @@ import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
+import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB;
+import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolPB;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
+import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolPB;
+import org.apache.hadoop.ipc.Client;
+import org.apache.hadoop.ipc.ProtobufRpcEngine;
+import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.hadoop.net.DNS;
 import org.apache.hadoop.net.NetUtils;
@@ -48,6 +57,8 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_DNS_NAMESERVER_K
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED_DEFAULT;
+
+import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -161,6 +172,29 @@ public final class HddsUtils {
         .orElse(ScmConfigKeys.OZONE_SCM_BLOCK_CLIENT_PORT_DEFAULT));
   }
 
+  /**
+   * Create a scm security client.
+   * @param conf    - Ozone configuration.
+   * @param address - inet socket address of scm.
+   *
+   * @return {@link SCMSecurityProtocol}
+   * @throws IOException
+   */
+  public static SCMSecurityProtocol getScmSecurityClient(
+      OzoneConfiguration conf, InetSocketAddress address) throws IOException {
+    RPC.setProtocolEngine(conf, SCMSecurityProtocolPB.class,
+        ProtobufRpcEngine.class);
+    long scmVersion =
+        RPC.getProtocolVersion(ScmBlockLocationProtocolPB.class);
+    SCMSecurityProtocolClientSideTranslatorPB scmSecurityClient =
+        new SCMSecurityProtocolClientSideTranslatorPB(
+            RPC.getProxy(SCMSecurityProtocolPB.class, scmVersion,
+                address, UserGroupInformation.getCurrentUser(),
+                conf, NetUtils.getDefaultSocketFactory(conf),
+                Client.getRpcTimeout(conf)));
+    return scmSecurityClient;
+  }
+
   /**
    * Retrieve the hostname, trying the supplied config keys in order.
    * Each config value may be absent, or if present in the format
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/GenericCli.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/GenericCli.java
index 79ef711ac2f..f905f6042ec 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/GenericCli.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/cli/GenericCli.java
@@ -85,8 +85,7 @@ public class GenericCli implements Callable<Void>, GenericParentCommand {
     OzoneConfiguration ozoneConf = new OzoneConfiguration();
     if (configurationOverrides != null) {
       for (Entry<String, String> entry : configurationOverrides.entrySet()) {
-        ozoneConf
-            .set(entry.getKey(), entry.getValue());
+        ozoneConf.set(entry.getKey(), entry.getValue());
       }
     }
     return ozoneConf;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index 43e6fe79b7c..b7166c7f476 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -30,7 +30,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
+import java.util.Properties;
 
 /**
  * Configuration for ozone.
@@ -161,4 +163,31 @@ public class OzoneConfiguration extends Configuration {
     Configuration.addDefaultResource("ozone-default.xml");
     Configuration.addDefaultResource("ozone-site.xml");
   }
+
+  /**
+   * The super class method getAllPropertiesByTag
+   * does not override values of properties
+   * if there is no tag present in the configs of
+   * newly added resources.
+   * @param tag
+   * @return Properties that belong to the tag
+   */
+  @Override
+  public Properties getAllPropertiesByTag(String tag) {
+    // Call getProps first to load the newly added resources
+    // before calling super.getAllPropertiesByTag
+    Properties updatedProps = getProps();
+    Properties propertiesByTag = super.getAllPropertiesByTag(tag);
+    Properties props = new Properties();
+    Enumeration properties = propertiesByTag.propertyNames();
+    while (properties.hasMoreElements()) {
+      Object propertyName =  properties.nextElement();
+      // get the current value of the property
+      Object value = updatedProps.getProperty(propertyName.toString());
+      if (value != null) {
+        props.put(propertyName, value);
+      }
+    }
+    return props;
+  }
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientReply.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientReply.java
index 56785556083..bae0758fddb 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientReply.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientReply.java
@@ -19,20 +19,28 @@
 package org.apache.hadoop.hdds.scm;
 
 
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
     .ContainerCommandResponseProto;
 
-import java.util.UUID;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * This class represents the Async reply from XceiverClient.
+ * This class represents the reply from XceiverClient.
  */
 public class XceiverClientReply {
 
   private CompletableFuture<ContainerCommandResponseProto> response;
   private Long logIndex;
-  private UUID dnId;
+
+  /**
+   * List of datanodes where the command got executed and reply is received.
+   * If there is an exception in the reply, these datanodes will inform
+   * about the servers where there is a failure.
+   */
+  private List<DatanodeDetails> datanodes;
 
   public XceiverClientReply(
       CompletableFuture<ContainerCommandResponseProto> response) {
@@ -40,10 +48,11 @@ public class XceiverClientReply {
   }
 
   public XceiverClientReply(
-      CompletableFuture<ContainerCommandResponseProto> response, UUID dnId) {
+      CompletableFuture<ContainerCommandResponseProto> response,
+      List<DatanodeDetails> datanodes) {
     this.logIndex = (long) 0;
     this.response = response;
-    this.dnId = dnId;
+    this.datanodes = datanodes == null ? new ArrayList<>() : datanodes;
   }
 
   public CompletableFuture<ContainerCommandResponseProto> getResponse() {
@@ -58,12 +67,12 @@ public class XceiverClientReply {
     this.logIndex = logIndex;
   }
 
-  public UUID getDatanode() {
-    return dnId;
+  public List<DatanodeDetails> getDatanodes() {
+    return datanodes;
   }
 
-  public void setDatanode(UUID datanodeId) {
-    this.dnId = datanodeId;
+  public void addDatanode(DatanodeDetails dn) {
+    datanodes.add(dn);
   }
 
   public void setResponse(
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
index aee2afd4ea1..1a183664a12 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
@@ -21,11 +21,11 @@ package org.apache.hadoop.hdds.scm;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -123,7 +123,7 @@ public abstract class XceiverClientSpi implements Closeable {
    * @throws IOException
    */
   public XceiverClientReply sendCommand(
-      ContainerCommandRequestProto request, List<UUID> excludeDns)
+      ContainerCommandRequestProto request, List<DatanodeDetails> excludeDns)
       throws IOException {
     try {
       XceiverClientReply reply;
@@ -157,14 +157,14 @@ public abstract class XceiverClientSpi implements Closeable {
    * Check if an specfic commitIndex is replicated to majority/all servers.
    * @param index index to watch for
    * @param timeout timeout provided for the watch ipeartion to complete
-   * @return the min commit index replicated to all or majority servers
-   *         in case of a failure
+   * @return reply containing the min commit index replicated to all or majority
+   *         servers in case of a failure
    * @throws InterruptedException
    * @throws ExecutionException
    * @throws TimeoutException
    * @throws IOException
    */
-  public abstract long watchForCommit(long index, long timeout)
+  public abstract XceiverClientReply watchForCommit(long index, long timeout)
       throws InterruptedException, ExecutionException, TimeoutException,
       IOException;
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/ExcludeList.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/ExcludeList.java
new file mode 100644
index 00000000000..ed4ac545320
--- /dev/null
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/ExcludeList.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.hadoop.hdds.scm.container.common.helpers;
+
+
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+
+import java.util.*;
+
+/**
+ * This class contains set of dns and containers which ozone client provides
+ * to be handed over to SCM when block allocation request comes.
+ */
+public class ExcludeList {
+
+  private final List<DatanodeDetails> datanodes;
+  private final List<ContainerID> containerIds;
+  private final List<PipelineID> pipelineIds;
+
+
+  public ExcludeList() {
+    datanodes = new ArrayList<>();
+    containerIds = new ArrayList<>();
+    pipelineIds = new ArrayList<>();
+  }
+
+  public List<ContainerID> getContainerIds() {
+    return containerIds;
+  }
+
+  public List<DatanodeDetails> getDatanodes() {
+    return datanodes;
+  }
+
+  public void addDatanodes(Collection<DatanodeDetails> dns) {
+    datanodes.addAll(dns);
+  }
+
+  public void addDatanode(DatanodeDetails dn) {
+    datanodes.add(dn);
+  }
+
+  public void addConatinerId(ContainerID containerId) {
+    containerIds.add(containerId);
+  }
+
+  public void addPipeline(PipelineID pipelineId) {
+    pipelineIds.add(pipelineId);
+  }
+
+  public List<PipelineID> getPipelineIds() {
+    return pipelineIds;
+  }
+
+  public HddsProtos.ExcludeListProto getProtoBuf() {
+    HddsProtos.ExcludeListProto.Builder builder =
+        HddsProtos.ExcludeListProto.newBuilder();
+    containerIds.parallelStream()
+        .forEach(id -> builder.addContainerIds(id.getId()));
+    datanodes.parallelStream().forEach(dn -> {
+      builder.addDatanodes(dn.getUuidString());
+    });
+    pipelineIds.parallelStream().forEach(pipelineID -> {
+      builder.addPipelineIds(pipelineID.getProtobuf());
+    });
+    return builder.build();
+  }
+
+  public static ExcludeList getFromProtoBuf(
+      HddsProtos.ExcludeListProto excludeListProto) {
+    ExcludeList excludeList = new ExcludeList();
+    excludeListProto.getContainerIdsList().parallelStream().forEach(id -> {
+      excludeList.addConatinerId(ContainerID.valueof(id));
+    });
+    DatanodeDetails.Builder builder = DatanodeDetails.newBuilder();
+    excludeListProto.getDatanodesList().forEach(dn -> {
+      builder.setUuid(dn);
+      excludeList.addDatanode(builder.build());
+    });
+    excludeListProto.getPipelineIdsList().forEach(pipelineID -> {
+      excludeList.addPipeline(PipelineID.getFromProtobuf(pipelineID));
+    });
+    return excludeList;
+  }
+}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocol.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocol.java
index 6e95e7027cf..1a326726177 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocol.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocol.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hdds.scm.protocol;
 
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.security.KerberosInfo;
 import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
@@ -47,11 +48,14 @@ public interface ScmBlockLocationProtocol extends Closeable {
    * Asks SCM where a block should be allocated. SCM responds with the
    * set of datanodes that should be used creating this block.
    * @param size - size of the block.
+   * @param excludeList List of datanodes/containers to exclude during block
+   *                    allocation.
    * @return allocated block accessing info (key, pipeline).
    * @throws IOException
    */
   AllocatedBlock allocateBlock(long size, ReplicationType type,
-      ReplicationFactor factor, String owner) throws IOException;
+      ReplicationFactor factor, String owner, ExcludeList excludeList)
+      throws IOException;
 
   /**
    * Delete blocks for a set of object keys.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
index 184dd2b2c8c..96276f501c1 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hdds.protocol.proto.ScmBlockLocationProtocolProtos.Dele
 import org.apache.hadoop.hdds.protocol.proto.ScmBlockLocationProtocolProtos.KeyBlocks;
 import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
@@ -80,7 +81,7 @@ public final class ScmBlockLocationProtocolClientSideTranslatorPB
   @Override
   public AllocatedBlock allocateBlock(long size,
       HddsProtos.ReplicationType type, HddsProtos.ReplicationFactor factor,
-      String owner) throws IOException {
+      String owner, ExcludeList excludeList) throws IOException {
     Preconditions.checkArgument(size > 0, "block size must be greater than 0");
 
     AllocateScmBlockRequestProto request =
@@ -90,6 +91,7 @@ public final class ScmBlockLocationProtocolClientSideTranslatorPB
             .setFactor(factor)
             .setOwner(owner)
             .setTraceID(TracingUtil.exportCurrentSpan())
+            .setExcludeList(excludeList.getProtoBuf())
             .build();
     final AllocateScmBlockResponseProto response;
     try {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
index 62968314dfc..73e402523ab 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/storage/ContainerProtocolCalls.java
@@ -18,9 +18,11 @@
 
 package org.apache.hadoop.hdds.scm.storage;
 
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.scm.XceiverClientReply;
 import org.apache.hadoop.hdds.scm.container.common.helpers
     .BlockNotCommittedException;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
 import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
 import org.apache.hadoop.hdds.security.token.OzoneBlockTokenSelector;
 import org.apache.hadoop.io.Text;
@@ -71,7 +73,6 @@ import org.apache.hadoop.hdds.client.BlockID;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -232,7 +233,8 @@ public final class ContainerProtocolCalls  {
    * @throws IOException if there is an I/O error while performing the call
    */
   public static XceiverClientReply readChunk(XceiverClientSpi xceiverClient,
-      ChunkInfo chunk, BlockID blockID, String traceID, List<UUID> excludeDns)
+      ChunkInfo chunk, BlockID blockID, String traceID,
+      List<DatanodeDetails> excludeDns)
       throws IOException {
     ReadChunkRequestProto.Builder readChunkRequest = ReadChunkRequestProto
         .newBuilder()
@@ -563,6 +565,9 @@ public final class ContainerProtocolCalls  {
     } else if (response.getResult()
         == ContainerProtos.Result.BLOCK_NOT_COMMITTED) {
       throw new BlockNotCommittedException(response.getMessage());
+    } else if (response.getResult()
+        == ContainerProtos.Result.CLOSED_CONTAINER_IO) {
+      throw new ContainerNotOpenException(response.getMessage());
     }
     throw new StorageContainerException(
         response.getMessage(), response.getResult());
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/token/OzoneBlockTokenIdentifier.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/token/OzoneBlockTokenIdentifier.java
index 89457fda49c..54cf18002c3 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/token/OzoneBlockTokenIdentifier.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/token/OzoneBlockTokenIdentifier.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.BlockTokenSecretProto.Bu
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.TokenIdentifier;
+import org.apache.hadoop.security.token.Token.TrivialRenewer;
 
 import java.io.DataInput;
 import java.io.DataInputStream;
@@ -195,5 +196,17 @@ public class OzoneBlockTokenIdentifier extends TokenIdentifier {
     }
     out.write(builder.build().toByteArray());
   }
+
+  /**
+   * Default TrivialRenewer.
+   */
+  @InterfaceAudience.Private
+  public static class Renewer extends TrivialRenewer {
+
+    @Override
+    protected Text getKind() {
+      return KIND_NAME;
+    }
+  }
 }
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/CertificateApprover.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/CertificateApprover.java
index f9adb61febb..31d0aeaddc5 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/CertificateApprover.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/CertificateApprover.java
@@ -60,17 +60,22 @@ public interface CertificateApprover {
    * @param validFrom - Begin Date
    * @param validTill - End Date
    * @param certificationRequest - Certification Request.
+   * @param scmId - SCM id.
+   * @param clusterId - Cluster id.
    * @return Signed Certificate.
    * @throws IOException - On Error
    * @throws OperatorCreationException - on Error.
    */
+  @SuppressWarnings("ParameterNumber")
   X509CertificateHolder sign(
       SecurityConfig config,
       PrivateKey caPrivate,
       X509CertificateHolder caCertificate,
       Date validFrom,
       Date validTill,
-      PKCS10CertificationRequest certificationRequest)
+      PKCS10CertificationRequest certificationRequest,
+      String scmId,
+      String clusterId)
       throws IOException, OperatorCreationException;
 
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
index 827c82fbb0b..c7f37c18063 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
@@ -22,7 +22,10 @@ package org.apache.hadoop.hdds.security.x509.certificate.authority;
 import org.apache.hadoop.hdds.security.exception.SCMSecurityException;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.hdds.security.x509.certificate.authority.PKIProfiles.PKIProfile;
+import org.apache.hadoop.hdds.security.x509.keys.SecurityUtil;
 import org.apache.hadoop.util.Time;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x500.style.BCStyle;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -67,18 +70,22 @@ public class DefaultApprover extends BaseApprover {
    * @param validFrom - Begin Da te
    * @param validTill - End Date
    * @param certificationRequest - Certification Request.
+   * @param scmId - SCM id.
+   * @param clusterId - Cluster id.
    * @return Signed Certificate.
    * @throws IOException - On Error
    * @throws OperatorCreationException - on Error.
    */
+  @SuppressWarnings("ParameterNumber")
   public  X509CertificateHolder sign(
       SecurityConfig config,
       PrivateKey caPrivate,
       X509CertificateHolder caCertificate,
       Date validFrom,
       Date validTill,
-      PKCS10CertificationRequest certificationRequest)
-      throws IOException, OperatorCreationException {
+      PKCS10CertificationRequest certificationRequest,
+      String scmId,
+      String clusterId) throws IOException, OperatorCreationException {
 
     AlgorithmIdentifier sigAlgId = new
         DefaultSignatureAlgorithmIdentifierFinder().find(
@@ -91,6 +98,29 @@ public class DefaultApprover extends BaseApprover {
     SubjectPublicKeyInfo keyInfo =
         certificationRequest.getSubjectPublicKeyInfo();
 
+    // Get scmId and cluster Id from subject name.
+    X500Name x500Name = certificationRequest.getSubject();
+    String csrScmId = x500Name.getRDNs(BCStyle.OU)[0].getFirst().getValue().
+        toASN1Primitive().toString();
+    String csrClusterId = x500Name.getRDNs(BCStyle.O)[0].getFirst().getValue().
+        toASN1Primitive().toString();
+
+    if (!scmId.equals(csrScmId) || !clusterId.equals(csrClusterId)) {
+      if (csrScmId.equalsIgnoreCase("null") &&
+          csrClusterId.equalsIgnoreCase("null")) {
+        // Special case to handle DN certificate generation as DN might not know
+        // scmId and clusterId before registration. In secure mode registration
+        // will succeed only after datanode has a valid certificate.
+        String cn = x500Name.getRDNs(BCStyle.CN)[0].getFirst().getValue()
+            .toASN1Primitive().toString();
+        x500Name = SecurityUtil.getDistinguishedName(cn, scmId, clusterId);
+      } else {
+        // Throw exception if scmId and clusterId doesn't match.
+        throw new SCMSecurityException("ScmId and ClusterId in CSR subject" +
+            " are incorrect.");
+      }
+    }
+
     RSAKeyParameters rsa =
         (RSAKeyParameters) PublicKeyFactory.createKey(keyInfo);
     if (rsa.getModulus().bitLength() < config.getSize()) {
@@ -104,7 +134,7 @@ public class DefaultApprover extends BaseApprover {
             BigInteger.valueOf(Time.monotonicNowNanos()),
             validFrom,
             validTill,
-            certificationRequest.getSubject(), keyInfo);
+            x500Name, keyInfo);
 
     ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId)
         .build(asymmetricKP);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
index fffde90f584..901c86cb3a7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
@@ -227,7 +227,7 @@ public class DefaultCAServer implements CertificateServer {
         X509CertificateHolder xcert = approver.sign(config,
             getCAKeys().getPrivate(),
             getCACertificate(), java.sql.Date.valueOf(beginDate),
-            java.sql.Date.valueOf(endDate), csr);
+            java.sql.Date.valueOf(endDate), csr, scmID, clusterID);
         store.storeValidCertificate(xcert.getSerialNumber(),
             CertificateCodec.getX509Certificate(xcert));
         xcertHolder.complete(xcert);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java
index a9f55596c9e..13319d16572 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java
@@ -20,6 +20,8 @@
 package org.apache.hadoop.hdds.security.x509.certificate.authority.PKIProfiles;
 
 import com.google.common.base.Preconditions;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.validator.routines.DomainValidator;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.x500.RDN;
@@ -32,7 +34,6 @@ import org.bouncycastle.asn1.x509.KeyUsage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.DatatypeConverter;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.AbstractMap.SimpleEntry;
@@ -234,10 +235,10 @@ public class DefaultProfile implements PKIProfile {
       // TODO: Fail? if we cannot resolve the Hostname?
       try {
         final InetAddress byAddress = InetAddress.getByAddress(
-            DatatypeConverter.parseHexBinary(value.substring(1)));
+            Hex.decodeHex(value.substring(1)));
         LOG.debug("Host Name/IP Address : {}", byAddress.toString());
         return true;
-      } catch (UnknownHostException e) {
+      } catch (UnknownHostException | DecoderException e) {
         return false;
       }
     case GeneralName.dNSName:
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClient.java
index f3ad16a6723..3d3124629ca 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClient.java
@@ -109,7 +109,7 @@ public interface CertificateClient {
    *
    * @return CertificateSignRequest.Builder
    */
-  CertificateSignRequest.Builder getCSRBuilder();
+  CertificateSignRequest.Builder getCSRBuilder() throws CertificateException;
 
   /**
    * Get the certificate of well-known entity from SCM.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
index d41c6fef16d..ae678fe9a0d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
@@ -19,6 +19,8 @@
 
 package org.apache.hadoop.hdds.security.x509.certificate.client;
 
+import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
+import org.apache.hadoop.hdds.security.x509.exceptions.CertificateException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,8 +32,22 @@ public class DNCertificateClient extends DefaultCertificateClient {
 
   private static final Logger LOG =
       LoggerFactory.getLogger(DNCertificateClient.class);
-  DNCertificateClient(SecurityConfig securityConfig, String component) {
-    super(securityConfig, component, LOG);
+  public DNCertificateClient(SecurityConfig securityConfig) {
+    super(securityConfig, LOG);
+  }
+
+  /**
+   * Returns a CSR builder that can be used to creates a Certificate signing
+   * request.
+   *
+   * @return CertificateSignRequest.Builder
+   */
+  @Override
+  public CertificateSignRequest.Builder getCSRBuilder()
+      throws CertificateException {
+    return super.getCSRBuilder()
+        .setDigitalEncryption(false)
+        .setDigitalSignature(false);
   }
 
   public Logger getLogger() {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index 466e1c594f4..6d023b29b16 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hdds.security.x509.certificate.client;
 
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec;
 import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
@@ -66,20 +67,16 @@ public abstract class DefaultCertificateClient implements CertificateClient {
 
   private final Logger logger;
   private final SecurityConfig securityConfig;
-  private final String component;
   private final KeyCodec keyCodec;
   private PrivateKey privateKey;
   private PublicKey publicKey;
   private X509Certificate x509Certificate;
 
 
-  DefaultCertificateClient(SecurityConfig securityConfig, String component,
-      Logger log) {
+  DefaultCertificateClient(SecurityConfig securityConfig, Logger log) {
     Objects.requireNonNull(securityConfig);
-    Objects.requireNonNull(component);
-    this.component = component;
     this.securityConfig = securityConfig;
-    keyCodec = new KeyCodec(securityConfig, component);
+    keyCodec = new KeyCodec(securityConfig);
     this.logger = log;
   }
 
@@ -95,15 +92,14 @@ public abstract class DefaultCertificateClient implements CertificateClient {
       return privateKey;
     }
 
-    Path keyPath = securityConfig.getKeyLocation(component);
+    Path keyPath = securityConfig.getKeyLocation();
     if (OzoneSecurityUtil.checkIfFileExist(keyPath,
         securityConfig.getPrivateKeyFileName())) {
       try {
         privateKey = keyCodec.readPrivateKey();
       } catch (InvalidKeySpecException | NoSuchAlgorithmException
           | IOException e) {
-        getLogger().error("Error while getting private key for {}",
-            component, e);
+        getLogger().error("Error while getting private key.", e);
       }
     }
     return privateKey;
@@ -121,15 +117,14 @@ public abstract class DefaultCertificateClient implements CertificateClient {
       return publicKey;
     }
 
-    Path keyPath = securityConfig.getKeyLocation(component);
+    Path keyPath = securityConfig.getKeyLocation();
     if (OzoneSecurityUtil.checkIfFileExist(keyPath,
         securityConfig.getPublicKeyFileName())) {
       try {
         publicKey = keyCodec.readPublicKey();
       } catch (InvalidKeySpecException | NoSuchAlgorithmException
           | IOException e) {
-        getLogger().error("Error while getting private key for {}",
-            component, e);
+        getLogger().error("Error while getting public key.", e);
       }
     }
     return publicKey;
@@ -147,18 +142,18 @@ public abstract class DefaultCertificateClient implements CertificateClient {
       return x509Certificate;
     }
 
-    Path certPath = securityConfig.getCertificateLocation(component);
+    Path certPath = securityConfig.getCertificateLocation();
     if (OzoneSecurityUtil.checkIfFileExist(certPath,
         securityConfig.getCertificateFileName())) {
       CertificateCodec certificateCodec =
-          new CertificateCodec(securityConfig, component);
+          new CertificateCodec(securityConfig);
       try {
         X509CertificateHolder x509CertificateHolder =
             certificateCodec.readCertificate();
         x509Certificate =
             CertificateCodec.getX509Certificate(x509CertificateHolder);
       } catch (java.security.cert.CertificateException | IOException e) {
-        getLogger().error("Error reading certificate for {}", component, e);
+        getLogger().error("Error reading certificate.", e);
       }
     }
     return x509Certificate;
@@ -318,8 +313,26 @@ public abstract class DefaultCertificateClient implements CertificateClient {
    * @return CertificateSignRequest.Builder
    */
   @Override
-  public CertificateSignRequest.Builder getCSRBuilder() {
-    return new CertificateSignRequest.Builder();
+  public CertificateSignRequest.Builder getCSRBuilder()
+      throws CertificateException {
+    CertificateSignRequest.Builder builder =
+        new CertificateSignRequest.Builder()
+        .setConfiguration(securityConfig.getConfiguration());
+    try {
+      DomainValidator validator = DomainValidator.getInstance();
+      // Add all valid ips.
+      OzoneSecurityUtil.getValidInetsForCurrentHost().forEach(
+          ip -> {
+            builder.addIpAddress(ip.getHostAddress());
+            if(validator.isValid(ip.getCanonicalHostName())) {
+              builder.addDnsName(ip.getCanonicalHostName());
+            }
+          });
+    } catch (IOException e) {
+      throw new CertificateException("Error while adding ip to CSR builder",
+          e, CSR_ERROR);
+    }
+    return builder;
   }
 
   /**
@@ -345,8 +358,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
   @Override
   public void storeCertificate(X509Certificate certificate)
       throws CertificateException {
-    CertificateCodec certificateCodec = new CertificateCodec(securityConfig,
-        component);
+    CertificateCodec certificateCodec = new CertificateCodec(securityConfig);
     try {
       certificateCodec.writeCertificate(
           new X509CertificateHolder(certificate.getEncoded()));
@@ -595,7 +607,7 @@ public abstract class DefaultCertificateClient implements CertificateClient {
    * location.
    * */
   protected void bootstrapClientKeys() throws CertificateException {
-    Path keyPath = securityConfig.getKeyLocation(component);
+    Path keyPath = securityConfig.getKeyLocation();
     if (Files.notExists(keyPath)) {
       try {
         Files.createDirectories(keyPath);
@@ -618,10 +630,9 @@ public abstract class DefaultCertificateClient implements CertificateClient {
       keyCodec.writePrivateKey(keyPair.getPrivate());
     } catch (NoSuchProviderException | NoSuchAlgorithmException
         | IOException e) {
-      getLogger().error("Error while bootstrapping certificate client for {}",
-          component, e);
-      throw new CertificateException("Error while bootstrapping certificate " +
-          "client for" + component, BOOTSTRAP_ERROR);
+      getLogger().error("Error while bootstrapping certificate client.", e);
+      throw new CertificateException("Error while bootstrapping certificate.",
+          BOOTSTRAP_ERROR);
     }
     return keyPair;
   }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
index 8db57f0c5d2..57441304f8d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
@@ -19,6 +19,7 @@
 
 package org.apache.hadoop.hdds.security.x509.certificate.client;
 
+import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,8 +39,8 @@ public class OMCertificateClient extends DefaultCertificateClient {
   private static final Logger LOG =
       LoggerFactory.getLogger(OMCertificateClient.class);
 
-  public OMCertificateClient(SecurityConfig securityConfig, String component) {
-    super(securityConfig, component, LOG);
+  public OMCertificateClient(SecurityConfig securityConfig) {
+    super(securityConfig, LOG);
   }
 
   protected InitResponse handleCase(InitCase init) throws
@@ -96,6 +97,21 @@ public class OMCertificateClient extends DefaultCertificateClient {
     }
   }
 
+  /**
+   * Returns a CSR builder that can be used to creates a Certificate signing
+   * request.
+   *
+   * @return CertificateSignRequest.Builder
+   */
+  @Override
+  public CertificateSignRequest.Builder getCSRBuilder()
+      throws CertificateException {
+    return super.getCSRBuilder()
+        .setDigitalEncryption(true)
+        .setDigitalSignature(true);
+  }
+
+
   public Logger getLogger() {
     return LOG;
   }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/CertificateCodec.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/CertificateCodec.java
index 71c6d955de0..90d5325fb5f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/CertificateCodec.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/CertificateCodec.java
@@ -80,6 +80,16 @@ public class CertificateCodec {
     this.location = securityConfig.getCertificateLocation(component);
   }
 
+  /**
+   * Creates an CertificateCodec.
+   *
+   * @param config - Security Config.
+   */
+  public CertificateCodec(SecurityConfig config) {
+    this.securityConfig = config;
+    this.location = securityConfig.getCertificateLocation();
+  }
+
   /**
    * Creates an CertificateCodec.
    *
@@ -167,6 +177,22 @@ public class CertificateCodec {
     return location;
   }
 
+  /**
+   * Gets the X.509 Certificate from PEM encoded String.
+   *
+   * @param pemEncodedString - PEM encoded String.
+   * @return X509Certificate  - Certificate.
+   * @throws CertificateException - Thrown on Failure.
+   * @throws IOException          - Thrown on Failure.
+   */
+  public static X509Certificate getX509Cert(String pemEncodedString)
+      throws CertificateException, IOException {
+    CertificateFactory fact = CertificateFactory.getInstance("X.509");
+    try (InputStream input = IOUtils.toInputStream(pemEncodedString, UTF_8)) {
+      return (X509Certificate) fact.generateCertificate(input);
+    }
+  }
+
   /**
    * Write the Certificate pointed to the location by the configs.
    *
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
index a45e433516e..28f853a7f63 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/certificates/utils/CertificateSignRequest.java
@@ -144,6 +144,8 @@ public final class CertificateSignRequest {
     private SecurityConfig config;
     private List<GeneralName> altNames;
     private Boolean ca = false;
+    private boolean digitalSignature;
+    private boolean digitalEncryption;
 
     public CertificateSignRequest.Builder setConfiguration(
         Configuration configuration) {
@@ -171,6 +173,16 @@ public final class CertificateSignRequest {
       return this;
     }
 
+    public Builder setDigitalSignature(boolean dSign) {
+      this.digitalSignature = dSign;
+      return this;
+    }
+
+    public Builder setDigitalEncryption(boolean dEncryption) {
+      this.digitalEncryption = dEncryption;
+      return this;
+    }
+
     // Support SAN extenion with DNS and RFC822 Name
     // other name type will be added as needed.
     public CertificateSignRequest.Builder addDnsName(String dnsName) {
@@ -200,8 +212,13 @@ public final class CertificateSignRequest {
     }
 
     private Extension getKeyUsageExtension() throws IOException {
-      int keyUsageFlag = KeyUsage.digitalSignature | KeyUsage.keyEncipherment
-          | KeyUsage.dataEncipherment | KeyUsage.keyAgreement;
+      int keyUsageFlag = KeyUsage.keyAgreement;
+      if(digitalEncryption){
+        keyUsageFlag |= KeyUsage.keyEncipherment | KeyUsage.dataEncipherment;
+      }
+      if(digitalSignature) {
+        keyUsageFlag |= KeyUsage.digitalSignature;
+      }
 
       if (ca) {
         keyUsageFlag |= KeyUsage.keyCertSign | KeyUsage.cRLSign;
@@ -252,10 +269,6 @@ public final class CertificateSignRequest {
       Preconditions.checkNotNull(key, "KeyPair cannot be null");
       Preconditions.checkArgument(Strings.isNotBlank(subject), "Subject " +
           "cannot be blank");
-      Preconditions.checkArgument(Strings.isNotBlank(clusterID), "Cluster ID " +
-          "cannot be blank");
-      Preconditions.checkArgument(Strings.isNotBlank(scmID), "SCM ID cannot " +
-          "be blank");
 
       try {
         CertificateSignRequest csr = new CertificateSignRequest(subject, scmID,
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/exceptions/CertificateException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/exceptions/CertificateException.java
index bbdbec74d3f..49f8a1809c6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/exceptions/CertificateException.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/exceptions/CertificateException.java
@@ -82,6 +82,7 @@ public class CertificateException extends SCMSecurityException {
     CRYPTO_SIGN_ERROR,
     CERTIFICATE_ERROR,
     BOOTSTRAP_ERROR,
+    CSR_ERROR,
     CRYPTO_SIGNATURE_VERIFICATION_ERROR
   }
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/keys/KeyCodec.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/keys/KeyCodec.java
index 583c5d6d39b..a5ebdaefffc 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/keys/KeyCodec.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/keys/KeyCodec.java
@@ -87,6 +87,17 @@ public class KeyCodec {
     this.location = securityConfig.getKeyLocation(component);
   }
 
+  /**
+   * Creates an KeyCodec.
+   *
+   * @param config - Security Config.
+   */
+  public KeyCodec(SecurityConfig config) {
+    this.securityConfig = config;
+    isPosixFileSystem = KeyCodec::isPosix;
+    this.location = securityConfig.getKeyLocation();
+  }
+
   /**
    * Creates an HDDS Key Writer.
    *
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index cd40f7c0918..0d73905cd71 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -379,6 +379,23 @@ public final class OzoneConfigKeys {
   public static final String OZONE_FS_ISOLATED_CLASSLOADER =
       "ozone.fs.isolated-classloader";
 
+  // Ozone Client Retry and Failover configurations
+  public static final String OZONE_CLIENT_RETRY_MAX_ATTEMPTS_KEY =
+      "ozone.client.retry.max.attempts";
+  public static final int OZONE_CLIENT_RETRY_MAX_ATTEMPTS_DEFAULT =
+      10;
+  public static final String OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY =
+      "ozone.client.failover.max.attempts";
+  public static final int OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_DEFAULT =
+      15;
+  public static final String OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_KEY =
+      "ozone.client.failover.sleep.base.millis";
+  public static final int OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_DEFAULT =
+      500;
+  public static final String OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_KEY =
+      "ozone.client.failover.sleep.max.millis";
+  public static final int OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_DEFAULT =
+      15000;
 
   public static final String OZONE_FREON_HTTP_ENABLED_KEY =
       "ozone.freon.http.enabled";
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
index 37cfb7fb42a..8e3b02a9507 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
@@ -272,6 +272,11 @@ public final class OzoneConsts {
   public static final Metadata.Key<String> USER_METADATA_KEY =
       Metadata.Key.of(OZONE_USER, ASCII_STRING_MARSHALLER);
 
+  public static final String RPC_PORT = "RPC";
+
   // Default OMServiceID for OM Ratis servers to use as RaftGroupId
   public static final String OM_SERVICE_ID_DEFAULT = "omServiceIdDefault";
+
+  // Dummy OMNodeID for OM Clients to use for a non-HA OM setup
+  public static final String OM_NODE_ID_DUMMY = "omNodeIdDummy";
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneSecurityUtil.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneSecurityUtil.java
index c1f2906d6c5..c1fb8938061 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneSecurityUtil.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneSecurityUtil.java
@@ -21,13 +21,25 @@ package org.apache.hadoop.ozone;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_DEFAULT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
 
+import org.apache.commons.validator.routines.InetAddressValidator;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Ozone security Util class.
@@ -36,6 +48,12 @@ import java.nio.file.Paths;
 @InterfaceStability.Evolving
 public final class OzoneSecurityUtil {
 
+  private final static Logger LOG =
+      LoggerFactory.getLogger(OzoneSecurityUtil.class);
+  // List of ip's not recommended to be added to CSR.
+  private final static Set<String> INVALID_IPS = new HashSet<>(Arrays.asList(
+      "0.0.0.0", "127.0.0.1"));
+
   private OzoneSecurityUtil() {
   }
 
@@ -57,4 +75,44 @@ public final class OzoneSecurityUtil {
     return false;
   }
 
+  /**
+   * Iterates through network interfaces and return all valid ip's not
+   * listed in CertificateSignRequest#INVALID_IPS.
+   *
+   * @return List<InetAddress>
+   * @throws IOException if no network interface are found or if an error
+   * occurs.
+   */
+  public static List<InetAddress> getValidInetsForCurrentHost()
+      throws IOException {
+    List<InetAddress> hostIps = new ArrayList<>();
+    InetAddressValidator ipValidator = InetAddressValidator.getInstance();
+
+    Enumeration<NetworkInterface> enumNI =
+        NetworkInterface.getNetworkInterfaces();
+    if (enumNI != null) {
+      while (enumNI.hasMoreElements()) {
+        NetworkInterface ifc = enumNI.nextElement();
+        if (ifc.isUp()) {
+          Enumeration<InetAddress> enumAdds = ifc.getInetAddresses();
+          while (enumAdds.hasMoreElements()) {
+            InetAddress addr = enumAdds.nextElement();
+
+            if (ipValidator.isValid(addr.getHostAddress())
+                && !INVALID_IPS.contains(addr.getHostAddress())) {
+              LOG.info("Adding ip:{},host:{}", addr.getHostAddress(),
+                  addr.getHostName());
+              hostIps.add(addr);
+            } else {
+              LOG.info("ip:{},host:{} not returned.", addr.getHostAddress(),
+                  addr.getHostName());
+            }
+          }
+        }
+      }
+      return hostIps;
+    } else {
+      throw new IOException("Unable to get network interfaces.");
+    }
+  }
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
index 956218ab351..0d434c172a5 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
@@ -24,6 +24,7 @@ import io.opentracing.Scope;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolPB;
@@ -77,7 +78,8 @@ public final class ScmBlockLocationProtocolServerSideTranslatorPB
             request.getTraceID())) {
       AllocatedBlock allocatedBlock =
           impl.allocateBlock(request.getSize(), request.getType(),
-              request.getFactor(), request.getOwner());
+              request.getFactor(), request.getOwner(),
+              ExcludeList.getFromProtoBuf(request.getExcludeList()));
       if (allocatedBlock != null) {
         return
             AllocateScmBlockResponseProto.newBuilder()
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/LevelDBStoreIterator.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/LevelDBStoreIterator.java
index 7b62f7ad43e..92051dd6619 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/LevelDBStoreIterator.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/LevelDBStoreIterator.java
@@ -61,4 +61,9 @@ public class LevelDBStoreIterator implements MetaStoreIterator<KeyValue> {
   public void seekToLast() {
     levelDBIterator.seekToLast();
   }
+
+  @Override
+  public void prefixSeek(byte[] prefix) {
+    levelDBIterator.seek(prefix);
+  }
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/MetaStoreIterator.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/MetaStoreIterator.java
index 52d0a3efd3b..15ded0d6430 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/MetaStoreIterator.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/MetaStoreIterator.java
@@ -36,4 +36,9 @@ public interface MetaStoreIterator<T> extends Iterator<T> {
    */
   void seekToLast();
 
+  /**
+   * seek with prefix.
+   */
+  void prefixSeek(byte[] prefix);
+
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/RocksDBStoreIterator.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/RocksDBStoreIterator.java
index 6e9b6958da1..161d5de4917 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/RocksDBStoreIterator.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/RocksDBStoreIterator.java
@@ -63,4 +63,9 @@ public class RocksDBStoreIterator implements MetaStoreIterator<KeyValue> {
     rocksDBIterator.seekToLast();
   }
 
+  @Override
+  public void prefixSeek(byte[] prefix) {
+    rocksDBIterator.seek(prefix);
+  }
+
 }
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/DBCheckpoint.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/DBCheckpoint.java
index e25ac92c94d..a3b197a55f1 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/DBCheckpoint.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/DBCheckpoint.java
@@ -42,6 +42,11 @@ public interface DBCheckpoint {
    */
   long getLatestSequenceNumber();
 
+  /**
+   * Time taken in milliseconds for the checkpoint to be created.
+   */
+  long checkpointCreationTimeTaken();
+
   /**
    * Destroy the contents of the specified checkpoint to ensure
    * proper cleanup of the footprint on disk.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
index d44ebafb7fb..ce716c3c11b 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
@@ -22,6 +22,8 @@ package org.apache.hadoop.utils.db;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +43,6 @@ public class RDBCheckpointManager {
   public static final String RDB_CHECKPOINT_DIR_PREFIX = "rdb_checkpoint_";
   private static final Logger LOG =
       LoggerFactory.getLogger(RDBCheckpointManager.class);
-  public static final String JAVA_TMP_DIR = "java.io.tmpdir";
   private String checkpointNamePrefix = "";
 
   public RDBCheckpointManager(RocksDB rocksDB) {
@@ -79,12 +80,19 @@ public class RDBCheckpointManager {
       checkpointDir += "_" + RDB_CHECKPOINT_DIR_PREFIX + currentTime;
 
       Path checkpointPath = Paths.get(parentDir, checkpointDir);
+      Instant start = Instant.now();
       checkpoint.createCheckpoint(checkpointPath.toString());
+      Instant end = Instant.now();
+
+      long duration = Duration.between(start, end).toMillis();
+      LOG.debug("Created checkpoint at " + checkpointPath.toString() + " in "
+          + duration + " milliseconds");
 
       return new RocksDBCheckpoint(
           checkpointPath,
           currentTime,
-          db.getLatestSequenceNumber()); //Best guesstimate here. Not accurate.
+          db.getLatestSequenceNumber(), //Best guesstimate here. Not accurate.
+          duration);
 
     } catch (RocksDBException e) {
       LOG.error("Unable to create RocksDB Snapshot.", e);
@@ -97,13 +105,16 @@ public class RDBCheckpointManager {
     private Path checkpointLocation;
     private long checkpointTimestamp;
     private long latestSequenceNumber;
+    private long checkpointCreationTimeTaken;
 
     RocksDBCheckpoint(Path checkpointLocation,
                               long snapshotTimestamp,
-                              long latestSequenceNumber) {
+                              long latestSequenceNumber,
+                              long checkpointCreationTimeTaken) {
       this.checkpointLocation = checkpointLocation;
       this.checkpointTimestamp = snapshotTimestamp;
       this.latestSequenceNumber = latestSequenceNumber;
+      this.checkpointCreationTimeTaken = checkpointCreationTimeTaken;
     }
 
     @Override
@@ -121,8 +132,14 @@ public class RDBCheckpointManager {
       return this.latestSequenceNumber;
     }
 
+    @Override
+    public long checkpointCreationTimeTaken() {
+      return checkpointCreationTimeTaken;
+    }
+
     @Override
     public void cleanupCheckpoint() throws IOException {
+      LOG.debug("Cleaning up checkpoint at " + checkpointLocation.toString());
       FileUtils.deleteDirectory(checkpointLocation.toFile());
     }
   }
diff --git a/hadoop-hdds/common/src/main/proto/DatanodeContainerProtocol.proto b/hadoop-hdds/common/src/main/proto/DatanodeContainerProtocol.proto
index 197bfade848..7396eb31eef 100644
--- a/hadoop-hdds/common/src/main/proto/DatanodeContainerProtocol.proto
+++ b/hadoop-hdds/common/src/main/proto/DatanodeContainerProtocol.proto
@@ -142,6 +142,8 @@ enum Result {
   UNKNOWN_BCSID = 37;
   BCSID_MISMATCH = 38;
   CONTAINER_NOT_OPEN = 39;
+  CONTAINER_MISSING = 40;
+  BLOCK_TOKEN_VERIFICATION_FAILED = 41;
 }
 
 /**
@@ -245,6 +247,10 @@ message ContainerDataProto {
   optional ContainerType containerType = 10 [default = KeyValueContainer];
 }
 
+message ContainerIdSetProto {
+    repeated int64 containerId = 1;
+}
+
 enum ContainerType {
   KeyValueContainer = 1;
 }
diff --git a/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto b/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto
index 08a0359c408..85fbca600c4 100644
--- a/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto
+++ b/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto
@@ -42,6 +42,7 @@ message AllocateScmBlockRequestProto {
   required hadoop.hdds.ReplicationFactor factor = 3;
   required string owner = 4;
   optional string traceID = 5;
+  optional ExcludeListProto excludeList = 6;
 
 }
 
diff --git a/hadoop-hdds/common/src/main/proto/hdds.proto b/hadoop-hdds/common/src/main/proto/hdds.proto
index cc8b3179e5c..a7d7704352c 100644
--- a/hadoop-hdds/common/src/main/proto/hdds.proto
+++ b/hadoop-hdds/common/src/main/proto/hdds.proto
@@ -199,6 +199,12 @@ enum ScmOps {
     queryNode = 11;
 }
 
+message ExcludeListProto {
+    repeated string datanodes = 1;
+    repeated int64 containerIds = 2;
+    repeated PipelineID pipelineIds = 3;
+}
+
 /**
  * Block ID that uniquely identify a block by SCM.
  */
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index b114daa2999..eb68b6e3394 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1289,6 +1289,16 @@
     </description>
   </property>
 
+  <property>
+    <name>hdds.scm.wait.time.after.chillmode.exit</name>
+    <value>5m</value>
+    <tag>HDDS,SCM,OPERATION</tag>
+    <description> After exiting chillmode, wait for configured interval of
+      time to start replication monitor and cleanup activities of unhealthy
+      pipelines.
+    </description>
+  </property>
+
   <property>
     <name>hdds.scm.chillmode.enabled</name>
     <value>true</value>
@@ -1325,6 +1335,16 @@
     </description>
   </property>
 
+  <property>
+    <name>hdds.scm.chillmode.atleast.one.node.reported.pipeline.pct</name>
+    <value>0.90</value>
+    <tag>HDDS,SCM,OPERATION</tag>
+    <description>
+      Percentage of pipelines, where at least one datanode is reported in the
+      pipeline.
+    </description>
+  </property>
+
   <property>
     <name>hdds.container.action.max.limit</name>
     <value>20</value>
@@ -1636,6 +1656,16 @@
     </description>
   </property>
 
+  <property>
+    <name>ozone.om.ratis.server.role.check.interval</name>
+    <value>15s</value>
+    <tag>OZONE, OM, RATIS, MANAGEMENT</tag>
+    <description>The interval between OM leader performing a role
+      check on its ratis server. Ratis server informs OM if it
+      loses the leader role. The scheduled check is an secondary
+      check to ensure that the leader role is updated periodically
+      .</description>
+  </property>
 
   <property>
     <name>ozone.acl.authorizer.class</name>
@@ -1820,7 +1850,7 @@
   </property>
   <property>
     <name>ozone.scm.security.service.address</name>
-    <value>0.0.0.0:9961</value>
+    <value/>
     <tag>OZONE, HDDS, SECURITY</tag>
     <description>Address of SCMSecurityProtocolServer.</description>
   </property>
@@ -2019,4 +2049,203 @@
     </description>
   </property>
 
+  <property>
+    <name>hdds.datanode.http.kerberos.principal</name>
+    <value>HTTP/_HOST@EXAMPLE.COM</value>
+    <tag>HDDS, SECURITY, MANAGEMENT</tag>
+    <description>
+      The kerberos principal for the datanode http server.
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.http.kerberos.keytab</name>
+    <value>/etc/security/keytabs/HTTP.keytab</value>
+    <tag>HDDS, SECURITY, MANAGEMENT</tag>
+    <description>
+      The kerberos keytab file for datanode http server
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.http-address</name>
+    <value>0.0.0.0:9882</value>
+    <tag>HDDS, MANAGEMENT</tag>
+    <description>
+      The address and the base port where the Datanode web ui will listen on.
+      If the port is 0 then the server will start on a free port.
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.http-bind-host</name>
+    <value>0.0.0.0</value>
+    <tag>HDDS, MANAGEMENT</tag>
+    <description>
+      The actual address the Datanode web server will bind to. If this
+      optional address is set, it overrides only the hostname portion of
+      hdds.datanode.http-address.
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.http.enabled</name>
+    <value>true</value>
+    <tag>HDDS, MANAGEMENT</tag>
+    <description>
+      Property to enable or disable Datanode web ui.
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.https-address</name>
+    <value>0.0.0.0:9883</value>
+    <tag>HDDS, MANAGEMENT, SECURITY</tag>
+    <description>
+      The address and the base port where the Datanode web UI will listen
+      on using HTTPS.
+
+      If the port is 0 then the server will start on a free port.
+    </description>
+  </property>
+  <property>
+    <name>hdds.datanode.https-bind-host</name>
+    <value>0.0.0.0</value>
+    <tag>HDDS, MANAGEMENT, SECURITY</tag>
+    <description>
+      The actual address the Datanode web server will bind to using HTTPS.
+      If this optional address is set, it overrides only the hostname portion of
+      hdds.datanode.http-address.
+    </description>
+  </property>
+  <property>
+    <name>ozone.client.retry.max.attempts</name>
+    <value>10</value>
+    <description>
+      Max retry attempts for Ozone RpcClient talking to OzoneManagers.
+    </description>
+  </property>
+  <property>
+    <name>ozone.client.failover.max.attempts</name>
+    <value>15</value>
+    <description>
+      Expert only. The number of client failover attempts that should be
+      made before the failover is considered failed.
+    </description>
+  </property>
+  <property>
+    <name>ozone.client.failover.sleep.base.millis</name>
+    <value>500</value>
+    <description>
+      Expert only. The time to wait, in milliseconds, between failover
+      attempts increases exponentially as a function of the number of
+      attempts made so far, with a random factor of +/- 50%. This option
+      specifies the base value used in the failover calculation. The
+      first failover will retry immediately. The 2nd failover attempt
+      will delay at least ozone.client.failover.sleep.base.millis
+      milliseconds. And so on.
+    </description>
+  </property>
+  <property>
+    <name>ozone.client.failover.sleep.max.millis</name>
+    <value>15000</value>
+    <description>
+      Expert only. The time to wait, in milliseconds, between failover
+      attempts increases exponentially as a function of the number of
+      attempts made so far, with a random factor of +/- 50%. This option
+      specifies the maximum value to wait between failovers.
+      Specifically, the time between two failover attempts will not
+      exceed +/- 50% of ozone.client.failover.sleep.max.millis
+      milliseconds.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.http.enabled</name>
+    <value>true</value>
+    <tag>RECON, MANAGEMENT</tag>
+    <description>
+      Property to enable or disable Recon web user interface.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.http-address</name>
+    <value>0.0.0.0:9888</value>
+    <tag>RECON, MANAGEMENT</tag>
+    <description>
+      The address and the base port where the Recon web UI will listen on.
+
+      If the port is 0, then the server will start on a free port. However, it
+      is best to specify a well-known port, so it is easy to connect and see
+      the Recon management UI.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.http-bind-host</name>
+    <value>0.0.0.0</value>
+    <tag>RECON, MANAGEMENT</tag>
+    <description>
+      The actual address the Recon server will bind to. If this optional
+      the address is set, it overrides only the hostname portion of
+      ozone.recon.http-address.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.https-bind-host</name>
+    <value>0.0.0.0</value>
+    <tag>RECON, MANAGEMENT, SECURITY</tag>
+    <description>
+      The actual address the Recon web server will bind to using HTTPS.
+      If this optional address is set, it overrides only the hostname portion of
+      ozone.recon.https-address.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.https-address</name>
+    <value>0.0.0.0:9889</value>
+    <tag>RECON, MANAGEMENT, SECURITY</tag>
+    <description>
+      The address and the base port where the Recon web UI will listen
+      on using HTTPS. If the port is 0 then the server will start on a free
+      port.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.keytab.file</name>
+    <value/>
+    <tag>RECON, SECURITY</tag>
+    <description>
+      The keytab file for Kerberos authentication in Recon.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.authentication.kerberos.principal</name>
+    <value/>
+    <tag>RECON</tag>
+    <description>The server principal used by Ozone Recon server. This is
+      typically set to HTTP/_HOST@REALM.TLD The SPNEGO server principal
+      begins with the prefix HTTP/ by convention.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.container.db.cache.size.mb</name>
+    <value>128</value>
+    <tag>RECON, PERFORMANCE</tag>
+    <description>
+      The size of Recon DB cache in MB that used for caching files.
+      This value is set to an abnormally low value in the default configuration.
+      That is to make unit testing easy. Generally, this value should be set to
+      something like 16GB or more, if you intend to use Recon at scale.
+
+      A large value for this key allows a proportionally larger amount of Recon
+      container DB to be cached in memory. This makes Recon Container-Key
+      operations faster.
+    </description>
+  </property>
+  <property>
+    <name>ozone.recon.db.dirs</name>
+    <value/>
+    <tag>OZONE, RECON, STORAGE, PERFORMANCE</tag>
+    <description>
+      Directory where the Recon Server stores its metadata. This should
+      be specified as a single directory. If the directory does not
+      exist then the Recon will attempt to create it.
+      If undefined, then the Recon will log a warning and fallback to
+      ozone.metadata.dirs.
+    </description>
+  </property>
 </configuration>
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestOzoneConfiguration.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestOzoneConfiguration.java
new file mode 100644
index 00000000000..ef6e5a84ee9
--- /dev/null
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestOzoneConfiguration.java
@@ -0,0 +1,143 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdds.conf;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.junit.Rule;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Assert;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * Test class for OzoneConfiguration.
+ */
+public class TestOzoneConfiguration {
+
+  private Configuration conf;
+
+  @Rule
+  public TemporaryFolder tempConfigs = new TemporaryFolder();
+
+  @Before
+  public void setUp() throws Exception {
+    conf = new OzoneConfiguration();
+  }
+
+  private void startConfig(BufferedWriter out) throws IOException {
+    out.write("<?xml version=\"1.0\"?>\n");
+    out.write("<configuration>\n");
+  }
+
+  private void endConfig(BufferedWriter out) throws IOException {
+    out.write("</configuration>\n");
+    out.flush();
+    out.close();
+  }
+
+  @Test
+  public void testGetAllPropertiesByTags() throws Exception {
+    File coreDefault = tempConfigs.newFile("core-default-test.xml");
+    File coreSite = tempConfigs.newFile("core-site-test.xml");
+    try (BufferedWriter out = new BufferedWriter(new FileWriter(coreDefault))) {
+      startConfig(out);
+      appendProperty(out, "hadoop.tags.system", "YARN,HDFS,NAMENODE");
+      appendProperty(out, "hadoop.tags.custom", "MYCUSTOMTAG");
+      appendPropertyByTag(out, "dfs.cblock.trace.io", "false", "YARN");
+      appendPropertyByTag(out, "dfs.replication", "1", "HDFS");
+      appendPropertyByTag(out, "dfs.namenode.logging.level", "INFO",
+          "NAMENODE");
+      appendPropertyByTag(out, "dfs.random.key", "XYZ", "MYCUSTOMTAG");
+      endConfig(out);
+
+      Path fileResource = new Path(coreDefault.getAbsolutePath());
+      conf.addResource(fileResource);
+      Assert.assertEquals(conf.getAllPropertiesByTag("MYCUSTOMTAG")
+          .getProperty("dfs.random.key"), "XYZ");
+    }
+
+    try (BufferedWriter out = new BufferedWriter(new FileWriter(coreSite))) {
+      startConfig(out);
+      appendProperty(out, "dfs.random.key", "ABC");
+      appendProperty(out, "dfs.replication", "3");
+      appendProperty(out, "dfs.cblock.trace.io", "true");
+      endConfig(out);
+
+      Path fileResource = new Path(coreSite.getAbsolutePath());
+      conf.addResource(fileResource);
+    }
+
+    // Test if values are getting overridden even without tags being present
+    Assert.assertEquals("3", conf.getAllPropertiesByTag("HDFS")
+        .getProperty("dfs.replication"));
+    Assert.assertEquals("ABC", conf.getAllPropertiesByTag("MYCUSTOMTAG")
+        .getProperty("dfs.random.key"));
+    Assert.assertEquals("true", conf.getAllPropertiesByTag("YARN")
+        .getProperty("dfs.cblock.trace.io"));
+  }
+
+  private void appendProperty(BufferedWriter out, String name, String val)
+      throws IOException {
+    this.appendProperty(out, name, val, false);
+  }
+
+  private void appendProperty(BufferedWriter out, String name, String val,
+                              boolean isFinal) throws IOException {
+    out.write("<property>");
+    out.write("<name>");
+    out.write(name);
+    out.write("</name>");
+    out.write("<value>");
+    out.write(val);
+    out.write("</value>");
+    if (isFinal) {
+      out.write("<final>true</final>");
+    }
+    out.write("</property>\n");
+  }
+
+  private void appendPropertyByTag(BufferedWriter out, String name, String val,
+                                   String tags) throws IOException {
+    this.appendPropertyByTag(out, name, val, false, tags);
+  }
+
+  private void appendPropertyByTag(BufferedWriter out, String name, String val,
+                                   boolean isFinal,
+                                   String tag) throws IOException {
+    out.write("<property>");
+    out.write("<name>");
+    out.write(name);
+    out.write("</name>");
+    out.write("<value>");
+    out.write(val);
+    out.write("</value>");
+    if (isFinal) {
+      out.write("<final>true</final>");
+    }
+    out.write("<tag>");
+    out.write(tag);
+    out.write("</tag>");
+    out.write("</property>\n");
+  }
+}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/package-info.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/package-info.java
new file mode 100644
index 00000000000..e72c902045b
--- /dev/null
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the OzoneConfiguration related tests.
+ */
+package org.apache.hadoop.hdds.conf;
\ No newline at end of file
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockApprover.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockApprover.java
index d1777e18a24..a8fa0af7b51 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockApprover.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/MockApprover.java
@@ -47,9 +47,10 @@ public class MockApprover extends BaseApprover {
 
   @Override
   public X509CertificateHolder sign(SecurityConfig config, PrivateKey caPrivate,
-                                    X509CertificateHolder caCertificate,
-                                    Date validFrom, Date validTill,
-                                    PKCS10CertificationRequest request)
+      X509CertificateHolder caCertificate,
+      Date validFrom, Date validTill,
+      PKCS10CertificationRequest request,
+      String scmId, String clusterId)
       throws IOException, OperatorCreationException {
     return null;
   }
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
index 8d807b7d925..64eb4bafd68 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/authority/TestDefaultCAServer.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.security.exception.SCMSecurityException;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
 import org.apache.hadoop.hdds.security.x509.keys.HDDSKeyGenerator;
+import org.apache.hadoop.test.LambdaTestUtils;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.junit.Before;
@@ -139,14 +140,57 @@ public class TestDefaultCAServer {
   public void testRequestCertificate() throws IOException,
       ExecutionException, InterruptedException,
       NoSuchProviderException, NoSuchAlgorithmException {
+    String scmId =  RandomStringUtils.randomAlphabetic(4);
+    String clusterId =  RandomStringUtils.randomAlphabetic(4);
+    KeyPair keyPair =
+        new HDDSKeyGenerator(conf).generateKey();
+    PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
+        .addDnsName("hadoop.apache.org")
+        .addIpAddress("8.8.8.8")
+        .setCA(false)
+        .setClusterID(clusterId)
+        .setScmID(scmId)
+        .setSubject("Ozone Cluster")
+        .setConfiguration(conf)
+        .setKey(keyPair)
+        .build();
+
+    // Let us convert this to a string to mimic the common use case.
+    String csrString = CertificateSignRequest.getEncodedString(csr);
+
+    CertificateServer testCA = new DefaultCAServer("testCA",
+        clusterId, scmId, caStore);
+    testCA.init(new SecurityConfig(conf),
+        CertificateServer.CAType.SELF_SIGNED_CA);
+
+    Future<X509CertificateHolder> holder = testCA.requestCertificate(csrString,
+        CertificateApprover.ApprovalType.TESTING_AUTOMATIC);
+    // Right now our calls are synchronous. Eventually this will have to wait.
+    assertTrue(holder.isDone());
+    assertNotNull(holder.get());
+  }
+
+  /**
+   * Tests that we are able
+   * to create a Test CA, creates it own self-Signed CA and then issue a
+   * certificate based on a CSR when scmId and clusterId are not set in
+   * csr subject.
+   * @throws SCMSecurityException - on ERROR.
+   * @throws ExecutionException - on ERROR.
+   * @throws InterruptedException - on ERROR.
+   * @throws NoSuchProviderException - on ERROR.
+   * @throws NoSuchAlgorithmException - on ERROR.
+   */
+  @Test
+  public void testRequestCertificateWithInvalidSubject() throws IOException,
+      ExecutionException, InterruptedException,
+      NoSuchProviderException, NoSuchAlgorithmException {
     KeyPair keyPair =
         new HDDSKeyGenerator(conf).generateKey();
     PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
         .addDnsName("hadoop.apache.org")
         .addIpAddress("8.8.8.8")
         .setCA(false)
-        .setClusterID("ClusterID")
-        .setScmID("SCMID")
         .setSubject("Ozone Cluster")
         .setConfiguration(conf)
         .setKey(keyPair)
@@ -168,4 +212,40 @@ public class TestDefaultCAServer {
     assertNotNull(holder.get());
   }
 
+  @Test
+  public void testRequestCertificateWithInvalidSubjectFailure()
+      throws Exception {
+    KeyPair keyPair =
+        new HDDSKeyGenerator(conf).generateKey();
+    PKCS10CertificationRequest csr = new CertificateSignRequest.Builder()
+        .addDnsName("hadoop.apache.org")
+        .addIpAddress("8.8.8.8")
+        .setCA(false)
+        .setScmID("wrong one")
+        .setClusterID("223432rf")
+        .setSubject("Ozone Cluster")
+        .setConfiguration(conf)
+        .setKey(keyPair)
+        .build();
+
+    // Let us convert this to a string to mimic the common use case.
+    String csrString = CertificateSignRequest.getEncodedString(csr);
+
+    CertificateServer testCA = new DefaultCAServer("testCA",
+        RandomStringUtils.randomAlphabetic(4),
+        RandomStringUtils.randomAlphabetic(4), caStore);
+    testCA.init(new SecurityConfig(conf),
+        CertificateServer.CAType.SELF_SIGNED_CA);
+
+    LambdaTestUtils.intercept(ExecutionException.class, "ScmId and " +
+            "ClusterId in CSR subject are incorrect",
+        () -> {
+          Future<X509CertificateHolder> holder =
+              testCA.requestCertificate(csrString,
+                  CertificateApprover.ApprovalType.TESTING_AUTOMATIC);
+          holder.isDone();
+          holder.get();
+        });
+  }
+
 }
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestCertificateClientInit.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestCertificateClientInit.java
index 2bdf746312b..c877c30d32b 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestCertificateClientInit.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestCertificateClientInit.java
@@ -61,7 +61,6 @@ public class TestCertificateClientInit {
 
   private CertificateClient dnCertificateClient;
   private CertificateClient omCertificateClient;
-  private static final String COMP = "test";
   private HDDSKeyGenerator keyGenerator;
   private Path metaDirPath;
   private SecurityConfig securityConfig;
@@ -97,11 +96,11 @@ public class TestCertificateClientInit {
     metaDirPath = Paths.get(path, "test");
     config.set(HDDS_METADATA_DIR_NAME, metaDirPath.toString());
     securityConfig = new SecurityConfig(config);
-    dnCertificateClient = new DNCertificateClient(securityConfig, COMP);
-    omCertificateClient = new OMCertificateClient(securityConfig, COMP);
+    dnCertificateClient = new DNCertificateClient(securityConfig);
+    omCertificateClient = new OMCertificateClient(securityConfig);
     keyGenerator = new HDDSKeyGenerator(securityConfig);
-    keyCodec = new KeyCodec(securityConfig, COMP);
-    Files.createDirectories(securityConfig.getKeyLocation(COMP));
+    keyCodec = new KeyCodec(securityConfig);
+    Files.createDirectories(securityConfig.getKeyLocation());
   }
 
   @After
@@ -118,7 +117,7 @@ public class TestCertificateClientInit {
     if (pvtKeyPresent) {
       keyCodec.writePrivateKey(keyPair.getPrivate());
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getPrivateKeyFileName()).toFile());
     }
 
@@ -127,7 +126,7 @@ public class TestCertificateClientInit {
         keyCodec.writePublicKey(keyPair.getPublic());
       }
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getPublicKeyFileName()).toFile());
     }
 
@@ -135,11 +134,11 @@ public class TestCertificateClientInit {
       X509Certificate x509Certificate = KeyStoreTestUtil.generateCertificate(
           "CN=Test", keyPair, 10, securityConfig.getSignatureAlgo());
 
-      CertificateCodec codec = new CertificateCodec(securityConfig, COMP);
+      CertificateCodec codec = new CertificateCodec(securityConfig);
       codec.writeCertificate(new X509CertificateHolder(
           x509Certificate.getEncoded()));
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getCertificateFileName()).toFile());
     }
     InitResponse response = dnCertificateClient.init();
@@ -148,10 +147,10 @@ public class TestCertificateClientInit {
 
     if (!response.equals(FAILURE)) {
       assertTrue(OzoneSecurityUtil.checkIfFileExist(
-          securityConfig.getKeyLocation(COMP),
+          securityConfig.getKeyLocation(),
           securityConfig.getPrivateKeyFileName()));
       assertTrue(OzoneSecurityUtil.checkIfFileExist(
-          securityConfig.getKeyLocation(COMP),
+          securityConfig.getKeyLocation(),
           securityConfig.getPublicKeyFileName()));
     }
   }
@@ -162,7 +161,7 @@ public class TestCertificateClientInit {
     if (pvtKeyPresent) {
       keyCodec.writePrivateKey(keyPair.getPrivate());
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getPrivateKeyFileName()).toFile());
     }
 
@@ -171,7 +170,7 @@ public class TestCertificateClientInit {
         keyCodec.writePublicKey(keyPair.getPublic());
       }
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getPublicKeyFileName()).toFile());
     }
 
@@ -179,11 +178,11 @@ public class TestCertificateClientInit {
       X509Certificate x509Certificate = KeyStoreTestUtil.generateCertificate(
           "CN=Test", keyPair, 10, securityConfig.getSignatureAlgo());
 
-      CertificateCodec codec = new CertificateCodec(securityConfig, COMP);
+      CertificateCodec codec = new CertificateCodec(securityConfig);
       codec.writeCertificate(new X509CertificateHolder(
           x509Certificate.getEncoded()));
     } else {
-      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+      FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
           .toString(), securityConfig.getCertificateFileName()).toFile());
     }
     InitResponse response = omCertificateClient.init();
@@ -196,10 +195,10 @@ public class TestCertificateClientInit {
 
     if (!response.equals(FAILURE)) {
       assertTrue(OzoneSecurityUtil.checkIfFileExist(
-          securityConfig.getKeyLocation(COMP),
+          securityConfig.getKeyLocation(),
           securityConfig.getPrivateKeyFileName()));
       assertTrue(OzoneSecurityUtil.checkIfFileExist(
-          securityConfig.getKeyLocation(COMP),
+          securityConfig.getKeyLocation(),
           securityConfig.getPublicKeyFileName()));
     }
   }
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java
index 7a3f4f2691d..61244f45723 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java
@@ -64,7 +64,6 @@ public class TestDefaultCertificateClient {
 
   private OMCertificateClient omCertClient;
   private DNCertificateClient dnCertClient;
-  private static final String COMP = "test";
   private HDDSKeyGenerator keyGenerator;
   private Path metaDirPath;
   private SecurityConfig securityConfig;
@@ -81,13 +80,13 @@ public class TestDefaultCertificateClient {
     securityConfig = new SecurityConfig(config);
     getCertClient();
     keyGenerator = new HDDSKeyGenerator(securityConfig);
-    keyCodec = new KeyCodec(securityConfig, COMP);
-    Files.createDirectories(securityConfig.getKeyLocation(COMP));
+    keyCodec = new KeyCodec(securityConfig);
+    Files.createDirectories(securityConfig.getKeyLocation());
   }
 
   private void getCertClient() {
-    omCertClient = new OMCertificateClient(securityConfig, COMP);
-    dnCertClient = new DNCertificateClient(securityConfig, COMP);
+    omCertClient = new OMCertificateClient(securityConfig);
+    dnCertClient = new DNCertificateClient(securityConfig);
   }
 
   @After
@@ -160,7 +159,7 @@ public class TestDefaultCertificateClient {
         () -> omCertClient.signDataStream(IOUtils.toInputStream(data,
             UTF)));
 
-    KeyPair keyPair = generateKeyPairFiles();
+    generateKeyPairFiles();
     byte[] sign = omCertClient.signDataStream(IOUtils.toInputStream(data,
         UTF));
     validateHash(sign, data.getBytes());
@@ -247,11 +246,11 @@ public class TestDefaultCertificateClient {
     omClientLog.clearOutput();
 
     // Case 1. Expect failure when keypair validation fails.
-    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
         .toString(), securityConfig.getPrivateKeyFileName()).toFile());
     keyCodec.writePrivateKey(keyPair.getPrivate());
 
-    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
         .toString(), securityConfig.getPublicKeyFileName()).toFile());
     keyCodec.writePublicKey(keyPair2.getPublic());
 
@@ -272,12 +271,12 @@ public class TestDefaultCertificateClient {
     // Case 2. Expect failure when certificate is generated from different
     // private key and keypair validation fails.
     getCertClient();
-    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
         .toString(), securityConfig.getCertificateFileName()).toFile());
     X509Certificate x509Certificate = KeyStoreTestUtil.generateCertificate(
         "CN=Test", keyGenerator.generateKey(), 10,
         securityConfig.getSignatureAlgo());
-    CertificateCodec codec = new CertificateCodec(securityConfig, COMP);
+    CertificateCodec codec = new CertificateCodec(securityConfig);
     codec.writeCertificate(new X509CertificateHolder(
         x509Certificate.getEncoded()));
 
@@ -299,7 +298,7 @@ public class TestDefaultCertificateClient {
 
     // Re write the correct public key.
     getCertClient();
-    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
         .toString(), securityConfig.getPublicKeyFileName()).toFile());
     keyCodec.writePublicKey(keyPair.getPublic());
 
@@ -319,7 +318,7 @@ public class TestDefaultCertificateClient {
 
     // Case 4. Failure when public key recovery fails.
     getCertClient();
-    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMP)
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
         .toString(), securityConfig.getPublicKeyFileName()).toFile());
 
     // Check for DN.
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
index 16b32147e60..5720d27b161 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/x509/certificates/TestCertificateSignRequest.java
@@ -213,24 +213,6 @@ public class TestCertificateSignRequest {
       builder.setSubject(subject);
     }
 
-    // Now try with blank/null SCM ID
-    try {
-      builder.setScmID(null);
-      builder.build();
-      Assert.fail("Null/Blank SCM ID should have thrown.");
-    } catch (IllegalArgumentException e) {
-      builder.setScmID(scmID);
-    }
-
-    // Now try with blank/null SCM ID
-    try {
-      builder.setClusterID(null);
-      builder.build();
-      Assert.fail("Null/Blank Cluster ID should have thrown.");
-    } catch (IllegalArgumentException e) {
-      builder.setClusterID(clusterID);
-    }
-
     // Now try with invalid IP address
     try {
       builder.addIpAddress("255.255.255.*");
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/TestMetadataStore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/TestMetadataStore.java
index 5da8fbc1c92..96d818b522f 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/TestMetadataStore.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/TestMetadataStore.java
@@ -163,6 +163,58 @@ public class TestMetadataStore {
 
   }
 
+
+  @Test
+  public void testIteratorPrefixSeek() throws Exception {
+    Configuration conf = new OzoneConfiguration();
+    conf.set(OzoneConfigKeys.OZONE_METADATA_STORE_IMPL, storeImpl);
+    File dbDir = GenericTestUtils.getRandomizedTestDir();
+    MetadataStore dbStore = MetadataStoreBuilder.newBuilder()
+        .setConf(conf)
+        .setCreateIfMissing(true)
+        .setDbFile(dbDir)
+        .build();
+
+    for (int i = 0; i < 5; i++) {
+      dbStore.put(getBytes("a" + i), getBytes("a-value" + i));
+    }
+
+    for (int i = 0; i < 5; i++) {
+      dbStore.put(getBytes("b" + i), getBytes("b-value" + i));
+    }
+
+    for (int i = 0; i < 5; i++) {
+      dbStore.put(getBytes("c" + i), getBytes("c-value" + i));
+    }
+
+    for (int i = 5; i < 10; i++) {
+      dbStore.put(getBytes("b" + i), getBytes("b-value" + i));
+    }
+
+    for (int i = 5; i < 10; i++) {
+      dbStore.put(getBytes("a" + i), getBytes("a-value" + i));
+    }
+
+
+    MetaStoreIterator<KeyValue> metaStoreIterator = dbStore.iterator();
+    metaStoreIterator.prefixSeek(getBytes("b"));
+    int i = 0;
+    while (metaStoreIterator.hasNext()) {
+      KeyValue val = metaStoreIterator.next();
+      String key = getString(val.getKey());
+      if (key.startsWith("b")) {
+        assertEquals("b-value" + i, getString(val.getValue()));
+      } else {
+        break;
+      }
+      i++;
+    }
+    assertTrue(i == 10);
+    dbStore.close();
+    dbStore.destroy();
+    FileUtils.deleteDirectory(dbDir);
+  }
+
   @Test
   public void testMetaStoreConfigDifferentFromType() throws IOException {
 
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeHttpServer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeHttpServer.java
new file mode 100644
index 00000000000..3dcfcfe547c
--- /dev/null
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeHttpServer.java
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.server.BaseHttpServer;
+
+/**
+ * Simple http server to provide basic monitoring for hdds datanode.
+ * <p>
+ * This server is used to access default /conf /prom /prof endpoints.
+ */
+public class HddsDatanodeHttpServer extends BaseHttpServer {
+
+  public HddsDatanodeHttpServer(Configuration conf) throws IOException {
+    super(conf, "hddsDatanode");
+  }
+
+  @Override
+  protected String getHttpAddressKey() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_ADDRESS_KEY;
+  }
+
+  @Override
+  protected String getHttpBindHostKey() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_BIND_HOST_KEY;
+  }
+
+  @Override
+  protected String getHttpsAddressKey() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTPS_ADDRESS_KEY;
+  }
+
+  @Override
+  protected String getHttpsBindHostKey() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTPS_BIND_HOST_KEY;
+  }
+
+  @Override
+  protected String getBindHostDefault() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_BIND_HOST_DEFAULT;
+  }
+
+  @Override
+  protected int getHttpBindPortDefault() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_BIND_PORT_DEFAULT;
+  }
+
+  @Override
+  protected int getHttpsBindPortDefault() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTPS_BIND_PORT_DEFAULT;
+  }
+
+  @Override
+  protected String getKeytabFile() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_KERBEROS_KEYTAB_FILE_KEY;
+  }
+
+  @Override
+  protected String getSpnegoPrincipal() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_KERBEROS_PRINCIPAL_KEY;
+  }
+
+  @Override
+  protected String getEnabledKey() {
+    return HddsConfigKeys.HDDS_DATANODE_HTTP_ENABLED_KEY;
+  }
+}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
index 3a92a4adf1d..260f3489d4b 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
@@ -26,17 +26,24 @@ import org.apache.hadoop.hdds.cli.GenericCli;
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.security.x509.SecurityConfig;
+import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.client.DNCertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec;
+import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils;
 import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine;
-import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.util.ServicePlugin;
 import org.apache.hadoop.util.StringUtils;
+import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;
@@ -44,9 +51,13 @@ import picocli.CommandLine.Command;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.security.KeyPair;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.List;
 import java.util.UUID;
 
+import static org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest.getEncodedString;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY;
 import static org.apache.hadoop.util.ExitUtil.terminate;
 
@@ -67,6 +78,9 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
   private DatanodeDetails datanodeDetails;
   private DatanodeStateMachine datanodeStateMachine;
   private List<ServicePlugin> plugins;
+  private CertificateClient dnCertClient;
+  private String component;
+  private HddsDatanodeHttpServer httpServer;
 
   /**
    * Default constructor.
@@ -133,6 +147,10 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
     }
   }
 
+  public static Logger getLogger() {
+    return LOG;
+  }
+
   /**
    * Starts HddsDatanode services.
    *
@@ -158,13 +176,15 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
                 .substring(0, 8));
         LOG.info("HddsDatanodeService host:{} ip:{}", hostname, ip);
         // Authenticate Hdds Datanode service if security is enabled
-        if (conf.getBoolean(OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY,
-            true)) {
+        if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+          component = "dn-" + datanodeDetails.getUuidString();
+
+          dnCertClient = new DNCertificateClient(new SecurityConfig(conf));
+
           if (SecurityUtil.getAuthenticationMethod(conf).equals(
               UserGroupInformation.AuthenticationMethod.KERBEROS)) {
-            LOG.debug("Ozone security is enabled. Attempting login for Hdds " +
-                    "Datanode user. "
-                    + "Principal: {},keytab: {}", conf.get(
+            LOG.info("Ozone security is enabled. Attempting login for Hdds " +
+                    "Datanode user. Principal: {},keytab: {}", conf.get(
                 DFSConfigKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY),
                 conf.get(DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY));
 
@@ -180,9 +200,18 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
           LOG.info("Hdds Datanode login successful.");
         }
         datanodeStateMachine = new DatanodeStateMachine(datanodeDetails, conf);
+        try {
+          httpServer = new HddsDatanodeHttpServer(conf);
+          httpServer.start();
+        } catch (Exception ex) {
+          LOG.error("HttpServer failed to start.", ex);
+        }
         startPlugins();
         // Starting HDDS Daemons
         datanodeStateMachine.startDaemon();
+        if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+          initializeCertificateClient(conf);
+        }
       } catch (IOException e) {
         throw new RuntimeException("Can't start the HDDS datanode plugin", e);
       } catch (AuthenticationException ex) {
@@ -192,6 +221,87 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
     }
   }
 
+  /**
+   * Initializes secure Datanode.
+   * */
+  @VisibleForTesting
+  public void initializeCertificateClient(OzoneConfiguration config)
+      throws IOException {
+    LOG.info("Initializing secure Datanode.");
+
+    CertificateClient.InitResponse response = dnCertClient.init();
+    LOG.info("Init response: {}", response);
+    switch (response) {
+    case SUCCESS:
+      LOG.info("Initialization successful, case:{}.", response);
+      break;
+    case GETCERT:
+      getSCMSignedCert(config);
+      LOG.info("Successfully stored SCM signed certificate, case:{}.",
+          response);
+      break;
+    case FAILURE:
+      LOG.error("DN security initialization failed, case:{}.", response);
+      throw new RuntimeException("DN security initialization failed.");
+    case RECOVER:
+      LOG.error("DN security initialization failed, case:{}. OM certificate " +
+          "is missing.", response);
+      throw new RuntimeException("DN security initialization failed.");
+    default:
+      LOG.error("DN security initialization failed. Init response: {}",
+          response);
+      throw new RuntimeException("DN security initialization failed.");
+    }
+  }
+
+  /**
+   * Get SCM signed certificate and store it using certificate client.
+   * @param config
+   * */
+  private void getSCMSignedCert(OzoneConfiguration config) {
+    try {
+      PKCS10CertificationRequest csr = getCSR(config);
+      // TODO: For SCM CA we should fetch certificate from multiple SCMs.
+      SCMSecurityProtocol secureScmClient =
+          HddsUtils.getScmSecurityClient(config,
+              HddsUtils.getScmAddressForSecurityProtocol(config));
+
+      String pemEncodedCert = secureScmClient.getDataNodeCertificate(
+          datanodeDetails.getProtoBufMessage(), getEncodedString(csr));
+
+      X509Certificate x509Certificate =
+          CertificateCodec.getX509Certificate(pemEncodedCert);
+      dnCertClient.storeCertificate(x509Certificate);
+    } catch (IOException | CertificateException e) {
+      LOG.error("Error while storing SCM signed certificate.", e);
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Creates CSR for DN.
+   * @param config
+   * */
+  @VisibleForTesting
+  public PKCS10CertificationRequest getCSR(Configuration config)
+      throws IOException {
+    CertificateSignRequest.Builder builder = dnCertClient.getCSRBuilder();
+    KeyPair keyPair = new KeyPair(dnCertClient.getPublicKey(),
+        dnCertClient.getPrivateKey());
+
+    String hostname = InetAddress.getLocalHost().getCanonicalHostName();
+    String subject = UserGroupInformation.getCurrentUser()
+        .getShortUserName() + "@" + hostname;
+
+    builder.setCA(false)
+        .setKey(keyPair)
+        .setConfiguration(config)
+        .setSubject(subject);
+
+    LOG.info("Creating csr for DN-> subject:{}", subject);
+    return builder.build();
+  }
+
   /**
    * Returns DatanodeDetails or null in case of Error.
    *
@@ -294,6 +404,14 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
     if (datanodeStateMachine != null) {
       datanodeStateMachine.stopDaemon();
     }
+    if (httpServer != null) {
+      try {
+        httpServer.stop();
+      } catch (Exception e) {
+        LOG.error("Stopping HttpServer is failed.", e);
+      }
+    }
+
   }
 
   @Override
@@ -308,4 +426,18 @@ public class HddsDatanodeService extends GenericCli implements ServicePlugin {
       }
     }
   }
+
+  @VisibleForTesting
+  public String getComponent() {
+    return component;
+  }
+
+  public CertificateClient getCertificateClient() {
+    return dnCertClient;
+  }
+
+  @VisibleForTesting
+  public void setCertificateClient(CertificateClient client) {
+    dnCertClient = client;
+  }
 }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
index aff22751bd4..4a7a950827b 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
@@ -35,9 +35,11 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.Map;
 import java.util.concurrent.ConcurrentNavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.stream.Collectors;
 
 
@@ -50,7 +52,8 @@ public class ContainerSet {
 
   private final ConcurrentSkipListMap<Long, Container> containerMap = new
       ConcurrentSkipListMap<>();
-
+  private final ConcurrentSkipListSet<Long> missingContainerSet =
+      new ConcurrentSkipListSet<>();
   /**
    * Add Container to container map.
    * @param container
@@ -128,6 +131,7 @@ public class ContainerSet {
    * @return containerMap Iterator
    */
   public Iterator<Map.Entry<Long, Container>> getContainerMapIterator() {
+    containerMap.keySet().stream().collect(Collectors.toSet());
     return containerMap.entrySet().iterator();
   }
 
@@ -218,4 +222,20 @@ public class ContainerSet {
     return deletionPolicy
         .chooseContainerForBlockDeletion(count, containerDataMap);
   }
+
+  public Set<Long> getMissingContainerSet() {
+    return missingContainerSet;
+  }
+
+  /**
+   * Builds the missing container set by taking a diff total no containers
+   * actually found and number of containers which actually got created.
+   * This will only be called during the initialization of Datanode Service
+   * when  it still not a part of any write Pipeline.
+   * @param createdContainerSet ContainerId set persisted in the Ratis snapshot
+   */
+  public void buildMissingContainerSet(Set<Long> createdContainerSet) {
+    missingContainerSet.addAll(createdContainerSet);
+    missingContainerSet.removeAll(containerMap.keySet());
+  }
 }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
index 3653cb16186..e7a6de388cb 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/HddsDispatcher.java
@@ -66,6 +66,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Ozone Container dispatcher takes a call from the netty server and routes it
@@ -101,7 +102,6 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
     this.containerCloseThreshold = conf.getFloat(
         HddsConfigKeys.HDDS_CONTAINER_CLOSE_THRESHOLD,
         HddsConfigKeys.HDDS_CONTAINER_CLOSE_THRESHOLD_DEFAULT);
-
   }
 
   @Override
@@ -132,6 +132,12 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
     }
   }
 
+  @Override
+  public void buildMissingContainerSet(Set<Long> createdContainerSet) {
+    containerSet.buildMissingContainerSet(createdContainerSet);
+  }
+
+  @SuppressWarnings("methodlength")
   @Override
   public ContainerCommandResponseProto dispatch(
       ContainerCommandRequestProto msg, DispatcherContext dispatcherContext) {
@@ -145,18 +151,61 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
     Map<String, String> params =
         ContainerCommandRequestPBHelper.getAuditParams(msg);
 
-    Container container = null;
-    ContainerType containerType = null;
+    Container container;
+    ContainerType containerType;
     ContainerCommandResponseProto responseProto = null;
     long startTime = System.nanoTime();
     ContainerProtos.Type cmdType = msg.getCmdType();
     long containerID = msg.getContainerID();
     metrics.incContainerOpsMetrics(cmdType);
+    container = getContainer(containerID);
+    boolean isWriteStage =
+        (cmdType == ContainerProtos.Type.WriteChunk && dispatcherContext != null
+            && dispatcherContext.getStage()
+            == DispatcherContext.WriteChunkStage.WRITE_DATA);
+    boolean isWriteCommitStage =
+        (cmdType == ContainerProtos.Type.WriteChunk && dispatcherContext != null
+            && dispatcherContext.getStage()
+            == DispatcherContext.WriteChunkStage.COMMIT_DATA);
+
+    // if the command gets executed other than Ratis, the default wroite stage
+    // is WriteChunkStage.COMBINED
+    boolean isCombinedStage =
+        cmdType == ContainerProtos.Type.WriteChunk && (dispatcherContext == null
+            || dispatcherContext.getStage()
+            == DispatcherContext.WriteChunkStage.COMBINED);
+    Set<Long> containerIdSet = null;
+    if (dispatcherContext != null) {
+      containerIdSet = dispatcherContext.getCreateContainerSet();
+    }
+    if (isWriteCommitStage) {
+      //  check if the container Id exist in the loaded snapshot file. if
+      // it does not , it infers that , this is a restart of dn where
+      // the we are reapplying the transaction which was not captured in the
+      // snapshot.
+      // just add it to the list, and remove it from missing container set
+      // as it might have been added in the list during "init".
+      Preconditions.checkNotNull(containerIdSet);
+      if (!containerIdSet.contains(containerID)) {
+        containerIdSet.add(containerID);
+        containerSet.getMissingContainerSet().remove(containerID);
+      }
+    }
+    if (getMissingContainerSet().contains(containerID)) {
+      StorageContainerException sce = new StorageContainerException(
+          "ContainerID " + containerID
+              + " has been lost and and cannot be recreated on this DataNode",
+          ContainerProtos.Result.CONTAINER_MISSING);
+      audit(action, eventType, params, AuditEventStatus.FAILURE, sce);
+      return ContainerUtils.logAndReturnError(LOG, sce, msg);
+    }
 
     if (cmdType != ContainerProtos.Type.CreateContainer) {
-      container = getContainer(containerID);
-
-      if (container == null && (cmdType == ContainerProtos.Type.WriteChunk
+      /**
+       * Create Container should happen only as part of Write_Data phase of
+       * writeChunk.
+       */
+      if (container == null && ((isWriteStage || isCombinedStage)
           || cmdType == ContainerProtos.Type.PutSmallFile)) {
         // If container does not exist, create one for WriteChunk and
         // PutSmallFile request
@@ -168,7 +217,12 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
           audit(action, eventType, params, AuditEventStatus.FAILURE, sce);
           return ContainerUtils.logAndReturnError(LOG, sce, msg);
         }
-
+        Preconditions.checkArgument(isWriteStage && containerIdSet != null
+            || dispatcherContext == null);
+        if (containerIdSet != null) {
+          // adds this container to list of containers created in the pipeline
+          containerIdSet.add(containerID);
+        }
         container = getContainer(containerID);
       }
 
@@ -406,6 +460,11 @@ public class HddsDispatcher implements ContainerDispatcher, Auditor {
     return containerSet.getContainer(containerID);
   }
 
+  @VisibleForTesting
+  public Set<Long> getMissingContainerSet() {
+    return containerSet.getMissingContainerSet();
+  }
+
   private ContainerType getContainerType(Container container) {
     return container.getContainerType();
   }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
index 46a0b55ddd5..e5a74cb10ec 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
 import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
 import org.apache.hadoop.ozone.container.common.transport.server.ratis.DispatcherContext;
 
+import java.util.Set;
+
 /**
  * Dispatcher acts as the bridge between the transport layer and
  * the actual container layer. This layer is capable of transforming
@@ -58,6 +60,12 @@ public interface ContainerDispatcher {
    */
   void init();
 
+  /**
+   * finds and builds the missing containers in case of a lost disk etc
+   * in the ContainerSet.
+   */
+  void buildMissingContainerSet(Set<Long> createdContainers);
+
   /**
    * Shutdown Dispatcher services.
    */
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 5587488ecfc..0fc2d0d99b6 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -21,10 +21,13 @@ package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
 
 import io.opentracing.Scope;
+import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
+import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils;
 import org.apache.ratis.proto.RaftProtos.RaftPeerRole;
 import org.apache.ratis.protocol.RaftGroup;
 import org.apache.ratis.protocol.RaftGroupId;
@@ -36,6 +39,8 @@ import org.apache.ratis.statemachine.impl.SingleFileSnapshotInfo;
 import org.apache.ratis.thirdparty.com.google.protobuf
     .InvalidProtocolBufferException;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Type;
+import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.
+    ContainerIdSetProto;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
     .ContainerCommandRequestProto;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
@@ -73,10 +78,15 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+
 
 /** A {@link org.apache.ratis.statemachine.StateMachine} for containers.
  *
@@ -126,6 +136,9 @@ public class ContainerStateMachine extends BaseStateMachine {
   private final XceiverServerRatis ratisServer;
   private final ConcurrentHashMap<Long, CompletableFuture<Message>>
       writeChunkFutureMap;
+
+  // keeps track of the containers created per pipeline
+  private final Set<Long> createContainerSet;
   private ExecutorService[] executors;
   private final int numExecutors;
   private final Map<Long, Long> applyTransactionCompletionMap;
@@ -160,6 +173,7 @@ public class ContainerStateMachine extends BaseStateMachine {
         .maximumSize(chunkExecutor.getCorePoolSize()).build();
     this.isBlockTokenEnabled = isBlockTokenEnabled;
     this.tokenVerifier = tokenVerifier;
+    this.createContainerSet = new ConcurrentSkipListSet<>();
   }
 
   @Override
@@ -181,26 +195,56 @@ public class ContainerStateMachine extends BaseStateMachine {
     loadSnapshot(storage.getLatestSnapshot());
   }
 
-  private long loadSnapshot(SingleFileSnapshotInfo snapshot) {
+  private long loadSnapshot(SingleFileSnapshotInfo snapshot)
+      throws IOException {
     if (snapshot == null) {
-      TermIndex empty = TermIndex.newTermIndex(0,
-          RaftServerConstants.INVALID_LOG_INDEX);
-      LOG.info("The snapshot info is null." +
-          "Setting the last applied index to:" + empty);
+      TermIndex empty =
+          TermIndex.newTermIndex(0, RaftServerConstants.INVALID_LOG_INDEX);
+      LOG.info(
+          "The snapshot info is null." + "Setting the last applied index to:"
+              + empty);
       setLastAppliedTermIndex(empty);
       lastIndex = RaftServerConstants.INVALID_LOG_INDEX;
       return RaftServerConstants.INVALID_LOG_INDEX;
     }
 
+    final File snapshotFile = snapshot.getFile().getPath().toFile();
     final TermIndex last =
-        SimpleStateMachineStorage.getTermIndexFromSnapshotFile(
-            snapshot.getFile().getPath().toFile());
+        SimpleStateMachineStorage.getTermIndexFromSnapshotFile(snapshotFile);
     LOG.info("Setting the last applied index to " + last);
     setLastAppliedTermIndex(last);
     lastIndex = last.getIndex();
+
+    // initialize the dispatcher with snapshot so that it build the missing
+    // container list
+    try (FileInputStream fin = new FileInputStream(snapshotFile)) {
+      byte[] containerIds = IOUtils.toByteArray(fin);
+      ContainerProtos.ContainerIdSetProto proto =
+          ContainerProtos.ContainerIdSetProto.parseFrom(containerIds);
+      // read the created containers list from the snapshot file and add it to
+      // the createContainerSet here.
+      // createContainerSet will further grow as and when containers get created
+      createContainerSet.addAll(proto.getContainerIdList());
+      dispatcher.buildMissingContainerSet(createContainerSet);
+    }
     return last.getIndex();
   }
 
+  /**
+   * As a part of taking snapshot with Ratis StateMachine, it will persist
+   * the existing container set in the snapshotFile.
+   * @param out OutputStream mapped to the Ratis snapshot file
+   * @throws IOException
+   */
+  public void persistContainerSet(OutputStream out) throws IOException {
+    ContainerIdSetProto.Builder builder = ContainerIdSetProto.newBuilder();
+    builder.addAllContainerId(createContainerSet);
+    // TODO : while snapshot is being taken, deleteContainer call should not
+    // should not happen. Lock protection will be required if delete
+    // container happens outside of Ratis.
+    IOUtils.write(builder.build().toByteArray(), out);
+  }
+
   @Override
   public long takeSnapshot() throws IOException {
     TermIndex ti = getLastAppliedTermIndex();
@@ -211,8 +255,13 @@ public class ContainerStateMachine extends BaseStateMachine {
       LOG.info("Taking a snapshot to file {}", snapshotFile);
       try {
         //TODO: For now, just create the file to save the term index,
-        //persist open container info to snapshot later.
-        snapshotFile.createNewFile();
+        boolean created = snapshotFile.createNewFile();
+        if (!created) {
+          throw new IOException("Failed to create ratis snapshot file");
+        }
+        try (FileOutputStream fos = new FileOutputStream(snapshotFile)) {
+          persistContainerSet(fos);
+        }
       } catch(IOException ioe) {
         LOG.warn("Failed to write snapshot file \"" + snapshotFile
             + "\", last applied index=" + ti);
@@ -227,7 +276,7 @@ public class ContainerStateMachine extends BaseStateMachine {
   public TransactionContext startTransaction(RaftClientRequest request)
       throws IOException {
     final ContainerCommandRequestProto proto =
-        getRequestProto(request.getMessage().getContent());
+        getContainerCommandRequestProto(request.getMessage().getContent());
     Preconditions.checkArgument(request.getRaftGroupId().equals(gid));
     try (Scope scope = TracingUtil
         .importAndCreateScope(proto.getCmdType().name(), proto.getTraceID())) {
@@ -244,17 +293,6 @@ public class ContainerStateMachine extends BaseStateMachine {
       }
       if (proto.getCmdType() == Type.WriteChunk) {
         final WriteChunkRequestProto write = proto.getWriteChunk();
-        // create the state machine data proto
-        final WriteChunkRequestProto dataWriteChunkProto =
-            WriteChunkRequestProto
-                .newBuilder(write)
-                .build();
-        ContainerCommandRequestProto dataContainerCommandProto =
-            ContainerCommandRequestProto
-                .newBuilder(proto)
-                .setWriteChunk(dataWriteChunkProto)
-                .build();
-
         // create the log entry proto
         final WriteChunkRequestProto commitWriteChunkProto =
             WriteChunkRequestProto.newBuilder()
@@ -273,7 +311,7 @@ public class ContainerStateMachine extends BaseStateMachine {
             .setClientRequest(request)
             .setStateMachine(this)
             .setServerRole(RaftPeerRole.LEADER)
-            .setStateMachineData(dataContainerCommandProto.toByteString())
+            .setStateMachineData(write.getData())
             .setLogData(commitContainerCommandProto.toByteString())
             .build();
       } else {
@@ -291,8 +329,8 @@ public class ContainerStateMachine extends BaseStateMachine {
     return entryProto.getStateMachineEntry().getStateMachineData();
   }
 
-  private ContainerCommandRequestProto getRequestProto(ByteString request)
-      throws InvalidProtocolBufferException {
+  private ContainerCommandRequestProto getContainerCommandRequestProto(
+      ByteString request) throws InvalidProtocolBufferException {
     // TODO: We can avoid creating new builder and set pipeline Id if
     // the client is already sending the pipeline id, then we just have to
     // validate the pipeline Id.
@@ -302,13 +340,22 @@ public class ContainerStateMachine extends BaseStateMachine {
   }
 
   private ContainerCommandResponseProto dispatchCommand(
-      ContainerCommandRequestProto requestProto,
-      DispatcherContext context) throws IOException {
-    LOG.trace("dispatch {}", requestProto);
-    if(isBlockTokenEnabled) {
-      // ServerInterceptors intercepts incoming request and creates ugi.
-      tokenVerifier.verify(UserGroupInformation.getCurrentUser()
-          .getShortUserName(), requestProto.getEncodedToken());
+      ContainerCommandRequestProto requestProto, DispatcherContext context) {
+    LOG.trace("dispatch {} containerID={} pipelineID={} traceID={}",
+        requestProto.getCmdType(), requestProto.getContainerID(),
+        requestProto.getPipelineID(), requestProto.getTraceID());
+    if (isBlockTokenEnabled) {
+      try {
+        // ServerInterceptors intercepts incoming request and creates ugi.
+        tokenVerifier
+            .verify(UserGroupInformation.getCurrentUser().getShortUserName(),
+                requestProto.getEncodedToken());
+      } catch (IOException ioe) {
+        StorageContainerException sce = new StorageContainerException(
+            "Block token verification failed. " + ioe.getMessage(), ioe,
+            ContainerProtos.Result.BLOCK_TOKEN_VERIFICATION_FAILED);
+        return ContainerUtils.logAndReturnError(LOG, sce, requestProto);
+      }
     }
     ContainerCommandResponseProto response =
         dispatcher.dispatch(requestProto, context);
@@ -317,7 +364,7 @@ public class ContainerStateMachine extends BaseStateMachine {
   }
 
   private Message runCommand(ContainerCommandRequestProto requestProto,
-      DispatcherContext context) throws IOException {
+      DispatcherContext context) {
     return dispatchCommand(requestProto, context)::toByteString;
   }
 
@@ -344,15 +391,12 @@ public class ContainerStateMachine extends BaseStateMachine {
             .setTerm(term)
             .setLogIndex(entryIndex)
             .setStage(DispatcherContext.WriteChunkStage.WRITE_DATA)
+            .setCreateContainerSet(createContainerSet)
             .build();
-    CompletableFuture<Message> writeChunkFuture;
-    try {
-      Message msg = runCommand(requestProto, context);
-      writeChunkFuture = CompletableFuture
-          .supplyAsync(() -> msg, chunkExecutor);
-    }catch(IOException ie) {
-      writeChunkFuture = completeExceptionally(ie);
-    }
+    // ensure the write chunk happens asynchronously in writeChunkExecutor pool
+    // thread.
+    CompletableFuture<Message> writeChunkFuture = CompletableFuture
+        .supplyAsync(() -> runCommand(requestProto, context), chunkExecutor);
 
     writeChunkFutureMap.put(entryIndex, writeChunkFuture);
     LOG.debug("writeChunk writeStateMachineData : blockId " + write.getBlockID()
@@ -378,8 +422,15 @@ public class ContainerStateMachine extends BaseStateMachine {
   public CompletableFuture<Message> writeStateMachineData(LogEntryProto entry) {
     try {
       metrics.incNumWriteStateMachineOps();
-      final ContainerCommandRequestProto requestProto =
-          getRequestProto(getStateMachineData(entry.getStateMachineLogEntry()));
+      ContainerCommandRequestProto requestProto =
+          getContainerCommandRequestProto(
+              entry.getStateMachineLogEntry().getLogData());
+      WriteChunkRequestProto writeChunk =
+          WriteChunkRequestProto.newBuilder(requestProto.getWriteChunk())
+              .setData(getStateMachineData(entry.getStateMachineLogEntry()))
+              .build();
+      requestProto = ContainerCommandRequestProto.newBuilder(requestProto)
+          .setWriteChunk(writeChunk).build();
       Type cmdType = requestProto.getCmdType();
 
       // For only writeChunk, there will be writeStateMachineData call.
@@ -403,7 +454,7 @@ public class ContainerStateMachine extends BaseStateMachine {
     try {
       metrics.incNumReadStateMachineOps();
       final ContainerCommandRequestProto requestProto =
-          getRequestProto(request.getContent());
+          getContainerCommandRequestProto(request.getContent());
       return CompletableFuture.completedFuture(runCommand(requestProto, null));
     } catch (IOException e) {
       metrics.incNumReadStateMachineFails();
@@ -453,34 +504,8 @@ public class ContainerStateMachine extends BaseStateMachine {
    */
   private ByteString getCachedStateMachineData(Long logIndex, long term,
       ContainerCommandRequestProto requestProto) throws ExecutionException {
-    try {
-      return reconstructWriteChunkRequest(
-          stateMachineDataCache.get(logIndex, new Callable<ByteString>() {
-            @Override
-            public ByteString call() throws Exception {
-              return readStateMachineData(requestProto, term, logIndex);
-            }
-          }), requestProto);
-    } catch (ExecutionException e) {
-      throw e;
-    }
-  }
-
-  private ByteString reconstructWriteChunkRequest(ByteString data,
-      ContainerCommandRequestProto requestProto) {
-    WriteChunkRequestProto writeChunkRequestProto =
-        requestProto.getWriteChunk();
-    // reconstruct the write chunk request
-    final WriteChunkRequestProto.Builder dataWriteChunkProto =
-        WriteChunkRequestProto.newBuilder(writeChunkRequestProto)
-            // adding the state machine data
-            .setData(data);
-
-    ContainerCommandRequestProto.Builder newStateMachineProto =
-        ContainerCommandRequestProto.newBuilder(requestProto)
-            .setWriteChunk(dataWriteChunkProto);
-
-    return newStateMachineProto.build().toByteString();
+    return stateMachineDataCache.get(logIndex,
+        () -> readStateMachineData(requestProto, term, logIndex));
   }
 
   /**
@@ -514,20 +539,23 @@ public class ContainerStateMachine extends BaseStateMachine {
     }
     try {
       final ContainerCommandRequestProto requestProto =
-          getRequestProto(entry.getStateMachineLogEntry().getLogData());
+          getContainerCommandRequestProto(
+              entry.getStateMachineLogEntry().getLogData());
       // readStateMachineData should only be called for "write" to Ratis.
       Preconditions.checkArgument(!HddsUtils.isReadOnly(requestProto));
       if (requestProto.getCmdType() == Type.WriteChunk) {
-        CompletableFuture<ByteString> future = new CompletableFuture<>();
-        return future.supplyAsync(() -> {
+        final CompletableFuture<ByteString> future = new CompletableFuture<>();
+        CompletableFuture.supplyAsync(() -> {
           try {
-            return getCachedStateMachineData(entry.getIndex(), entry.getTerm(),
-                requestProto);
+            future.complete(
+                getCachedStateMachineData(entry.getIndex(), entry.getTerm(),
+                    requestProto));
           } catch (ExecutionException e) {
             future.completeExceptionally(e);
-            return null;
           }
+          return future;
         }, chunkExecutor);
+        return future;
       } else {
         throw new IllegalStateException("Cmd type:" + requestProto.getCmdType()
             + " cannot have state machine data");
@@ -576,9 +604,9 @@ public class ContainerStateMachine extends BaseStateMachine {
     try {
       metrics.incNumApplyTransactionsOps();
       ContainerCommandRequestProto requestProto =
-          getRequestProto(trx.getStateMachineLogEntry().getLogData());
+          getContainerCommandRequestProto(
+              trx.getStateMachineLogEntry().getLogData());
       Type cmdType = requestProto.getCmdType();
-      CompletableFuture<Message> future;
       // Make sure that in write chunk, the user data is not set
       if (cmdType == Type.WriteChunk) {
         Preconditions
@@ -586,13 +614,14 @@ public class ContainerStateMachine extends BaseStateMachine {
         builder
             .setStage(DispatcherContext.WriteChunkStage.COMMIT_DATA);
       }
-      try {
-        Message msg = runCommand(requestProto, builder.build());
-        future = CompletableFuture.supplyAsync(() -> msg,
-            getCommandExecutor(requestProto));
-      } catch (IOException ie) {
-        future = completeExceptionally(ie);
+      if (cmdType == Type.WriteChunk || cmdType ==Type.PutSmallFile) {
+        builder.setCreateContainerSet(createContainerSet);
       }
+      // Ensure the command gets executed in a separate thread than
+      // stateMachineUpdater thread which is calling applyTransaction here.
+      CompletableFuture<Message> future = CompletableFuture
+          .supplyAsync(() -> runCommand(requestProto, builder.build()),
+              getCommandExecutor(requestProto));
 
       lastIndex = index;
       future.thenAccept(m -> {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/DispatcherContext.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/DispatcherContext.java
index 28033aa50c9..446f19f05ea 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/DispatcherContext.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/DispatcherContext.java
@@ -20,6 +20,8 @@ package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 
+import java.util.Set;
+
 /**
  * DispatcherContext class holds transport protocol specific context info
  * required for execution of container commands over the container dispatcher.
@@ -43,12 +45,15 @@ public final class DispatcherContext {
   // the log index in Ratis log to which the request belongs to
   private final long logIndex;
 
+  private final Set<Long> createContainerSet;
+
   private DispatcherContext(long term, long index, WriteChunkStage stage,
-      boolean readFromTmpFile) {
+      boolean readFromTmpFile, Set<Long> containerSet) {
     this.term = term;
     this.logIndex = index;
     this.stage = stage;
     this.readFromTmpFile = readFromTmpFile;
+    this.createContainerSet = containerSet;
   }
 
   public long getLogIndex() {
@@ -67,6 +72,10 @@ public final class DispatcherContext {
     return stage;
   }
 
+  public Set<Long> getCreateContainerSet() {
+    return createContainerSet;
+  }
+
   /**
    * Builder class for building DispatcherContext.
    */
@@ -75,11 +84,12 @@ public final class DispatcherContext {
     private boolean readFromTmpFile = false;
     private long term;
     private long logIndex;
+    private Set<Long> createContainerSet;
 
     /**
      * Sets the WriteChunkStage.
      *
-     * @param stage WriteChunk Stage
+     * @param writeChunkStage WriteChunk Stage
      * @return DispatcherContext.Builder
      */
     public Builder setStage(WriteChunkStage writeChunkStage) {
@@ -90,7 +100,7 @@ public final class DispatcherContext {
     /**
      * Sets the flag for reading from tmp chunk files.
      *
-     * @param readFromTmpFile whether to read from tmp chunk file or not
+     * @param setReadFromTmpFile whether to read from tmp chunk file or not
      * @return DispatcherContext.Builder
      */
     public Builder setReadFromTmpFile(boolean setReadFromTmpFile) {
@@ -101,7 +111,7 @@ public final class DispatcherContext {
     /**
      * Sets the current term for the container request from Ratis.
      *
-     * @param term current term
+     * @param currentTerm current term
      * @return DispatcherContext.Builder
      */
     public Builder setTerm(long currentTerm) {
@@ -112,7 +122,7 @@ public final class DispatcherContext {
     /**
      * Sets the logIndex for the container request from Ratis.
      *
-     * @param logIndex log index
+     * @param index log index
      * @return DispatcherContext.Builder
      */
     public Builder setLogIndex(long index) {
@@ -120,13 +130,24 @@ public final class DispatcherContext {
       return this;
     }
 
+    /**
+     * Sets the createContainerSet to contain all the containerIds per
+     * RaftGroup.
+     * @param set createContainerSet
+     * @return Builder
+     */
+    public Builder setCreateContainerSet(Set<Long> set) {
+      this.createContainerSet = set;
+      return this;
+    }
     /**
      * Builds and returns DispatcherContext instance.
      *
      * @return DispatcherContext
      */
     public DispatcherContext build() {
-      return new DispatcherContext(term, logIndex, stage, readFromTmpFile);
+      return new DispatcherContext(term, logIndex, stage, readFromTmpFile,
+          createContainerSet);
     }
 
   }
diff --git a/hadoop-hdds/container-service/src/main/resources/webapps/hddsDatanode/.gitkeep b/hadoop-hdds/container-service/src/main/resources/webapps/hddsDatanode/.gitkeep
new file mode 100644
index 00000000000..ff1232e5fca
--- /dev/null
+++ b/hadoop-hdds/container-service/src/main/resources/webapps/hddsDatanode/.gitkeep
@@ -0,0 +1,17 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java
new file mode 100644
index 00000000000..c6f65c7f589
--- /dev/null
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java
@@ -0,0 +1,269 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.hadoop.ozone;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.security.x509.SecurityConfig;
+import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.client.DNCertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec;
+import org.apache.hadoop.hdds.security.x509.keys.KeyCodec;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.test.LambdaTestUtils;
+import org.apache.hadoop.util.ServicePlugin;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.pkcs.PKCS10CertificationRequest;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+import java.nio.file.Paths;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.Callable;
+
+import static org.apache.hadoop.ozone.HddsDatanodeService.getLogger;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
+
+/**
+ * Test class for {@link HddsDatanodeService}.
+ */
+public class TestHddsSecureDatanodeInit {
+
+  private static File testDir;
+  private static OzoneConfiguration conf;
+  private static HddsDatanodeService service;
+  private static String[] args = new String[]{};
+  private static PrivateKey privateKey;
+  private static PublicKey publicKey;
+  private static GenericTestUtils.LogCapturer dnLogs;
+  private static CertificateClient client;
+  private static SecurityConfig securityConfig;
+  private static KeyCodec keyCodec;
+  private static CertificateCodec certCodec;
+  private static X509CertificateHolder certHolder;
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    testDir = GenericTestUtils.getRandomizedTestDir();
+    conf = new OzoneConfiguration();
+    conf.setBoolean(OzoneConfigKeys.OZONE_ENABLED, true);
+    conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath());
+    String volumeDir = testDir + "/disk1";
+    conf.set(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY, volumeDir);
+
+    conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
+    conf.setClass(OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY,
+        TestHddsDatanodeService.MockService.class,
+        ServicePlugin.class);
+    securityConfig = new SecurityConfig(conf);
+
+    service = HddsDatanodeService.createHddsDatanodeService(args, conf);
+    dnLogs = GenericTestUtils.LogCapturer.captureLogs(getLogger());
+    callQuietly(() -> {
+      service.start(null);
+      return null;
+    });
+    callQuietly(() -> {
+      service.initializeCertificateClient(conf);
+      return null;
+    });
+    certCodec = new CertificateCodec(securityConfig);
+    keyCodec = new KeyCodec(securityConfig);
+    dnLogs.clearOutput();
+    privateKey = service.getCertificateClient().getPrivateKey();
+    publicKey = service.getCertificateClient().getPublicKey();
+    X509Certificate x509Certificate = null;
+
+    x509Certificate = KeyStoreTestUtil.generateCertificate(
+        "CN=Test", new KeyPair(publicKey, privateKey), 10,
+        securityConfig.getSignatureAlgo());
+    certHolder = new X509CertificateHolder(x509Certificate.getEncoded());
+
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    FileUtil.fullyDelete(testDir);
+  }
+
+  @Before
+  public void setUpDNCertClient(){
+    client = new DNCertificateClient(securityConfig);
+    service.setCertificateClient(client);
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPrivateKeyFileName()).toFile());
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPublicKeyFileName()).toFile());
+    FileUtils.deleteQuietly(Paths.get(securityConfig
+        .getCertificateLocation().toString(),
+        securityConfig.getCertificateFileName()).toFile());
+    dnLogs.clearOutput();
+
+  }
+
+  @Test
+  public void testSecureDnStartupCase0() throws Exception {
+
+    // Case 0: When keypair as well as certificate is missing. Initial keypair
+    // boot-up. Get certificate will fail as no SCM is not running.
+    LambdaTestUtils.intercept(Exception.class, "",
+        () -> service.initializeCertificateClient(conf));
+
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: GETCERT"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase1() throws Exception {
+    // Case 1: When only certificate is present.
+
+    certCodec.writeCertificate(certHolder);
+    LambdaTestUtils.intercept(RuntimeException.class, "DN security" +
+            " initialization failed",
+        () -> service.initializeCertificateClient(conf));
+    Assert.assertNull(client.getPrivateKey());
+    Assert.assertNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: FAILURE"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase2() throws Exception {
+    // Case 2: When private key and certificate is missing.
+    keyCodec.writePublicKey(publicKey);
+    LambdaTestUtils.intercept(RuntimeException.class, "DN security" +
+            " initialization failed",
+        () -> service.initializeCertificateClient(conf));
+    Assert.assertNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: FAILURE"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase3() throws Exception {
+    // Case 3: When only public key and certificate is present.
+    keyCodec.writePublicKey(publicKey);
+    certCodec.writeCertificate(certHolder);
+    LambdaTestUtils.intercept(RuntimeException.class, "DN security" +
+            " initialization failed",
+        () -> service.initializeCertificateClient(conf));
+    Assert.assertNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: FAILURE"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase4() throws Exception {
+    // Case 4: When public key as well as certificate is missing.
+    keyCodec.writePrivateKey(privateKey);
+    LambdaTestUtils.intercept(RuntimeException.class, " DN security" +
+            " initialization failed",
+        () -> service.initializeCertificateClient(conf));
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: FAILURE"));
+    dnLogs.clearOutput();
+  }
+
+  @Test
+  public void testSecureDnStartupCase5() throws Exception {
+    // Case 5: If private key and certificate is present.
+    certCodec.writeCertificate(certHolder);
+    keyCodec.writePrivateKey(privateKey);
+    service.initializeCertificateClient(conf);
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: SUCCESS"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase6() throws Exception {
+    // Case 6: If key pair already exist than response should be GETCERT.
+    keyCodec.writePublicKey(publicKey);
+    keyCodec.writePrivateKey(privateKey);
+    LambdaTestUtils.intercept(Exception.class, "",
+        () -> service.initializeCertificateClient(conf));
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: GETCERT"));
+  }
+
+  @Test
+  public void testSecureDnStartupCase7() throws Exception {
+    // Case 7 When keypair and certificate is present.
+    keyCodec.writePublicKey(publicKey);
+    keyCodec.writePrivateKey(privateKey);
+    certCodec.writeCertificate(certHolder);
+
+    service.initializeCertificateClient(conf);
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(dnLogs.getOutput().contains("Init response: SUCCESS"));
+  }
+
+  /**
+   * Invoke a callable; Ignore all exception.
+   * @param closure closure to execute
+   * @return
+   */
+  public static void callQuietly(Callable closure) {
+    try {
+      closure.call();
+    } catch (Throwable e) {
+      // Ignore all Throwable,
+    }
+  }
+
+  @Test
+  public void testGetCSR() throws Exception {
+    keyCodec.writePublicKey(publicKey);
+    keyCodec.writePrivateKey(privateKey);
+    service.setCertificateClient(client);
+    PKCS10CertificationRequest csr =
+        service.getCSR(conf);
+    Assert.assertNotNull(csr);
+
+    csr = service.getCSR(conf);
+    Assert.assertNotNull(csr);
+
+    csr = service.getCSR(conf);
+    Assert.assertNotNull(csr);
+
+    csr = service.getCSR(conf);
+    Assert.assertNotNull(csr);
+  }
+
+}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
index a2e7f505147..8ef9e19d537 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
@@ -59,6 +59,7 @@ import static org.mockito.Mockito.times;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.UUID;
 
 /**
@@ -88,6 +89,8 @@ public class TestKeyValueHandler {
     Mockito.when(dispatcher.dispatch(any(), any())).thenCallRealMethod();
     Mockito.when(dispatcher.getContainer(anyLong())).thenReturn(
         Mockito.mock(KeyValueContainer.class));
+    Mockito.when(dispatcher.getMissingContainerSet())
+        .thenReturn(new HashSet<>());
     Mockito.when(handler.handle(any(), any(), any())).thenCallRealMethod();
     doCallRealMethod().when(dispatcher).setMetricsForTesting(any());
     dispatcher.setMetricsForTesting(Mockito.mock(ContainerMetrics.class));
diff --git a/hadoop-hdds/docs/content/OzoneFS.md b/hadoop-hdds/docs/content/OzoneFS.md
index b7f8a742297..84884341ecc 100644
--- a/hadoop-hdds/docs/content/OzoneFS.md
+++ b/hadoop-hdds/docs/content/OzoneFS.md
@@ -56,7 +56,7 @@ This will make this bucket to be the default file system for HDFS dfs commands a
 You also need to add the ozone-filesystem.jar file to the classpath:
 
 {{< highlight bash >}}
-export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-lib-.*.jar:$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH=/opt/ozone/share/ozonefs/lib/hadoop-ozone-filesystem-lib-current.*.jar:$HADOOP_CLASSPATH
 {{< /highlight >}}
 
 
@@ -82,7 +82,7 @@ Please note that any keys created/deleted in the bucket using methods apart from
 
 There are two ozonefs files which includes all the dependencies:
 
- * share/ozone/lib/hadoop-ozone-filesystem-lib-VERSION.jar
+ * share/ozone/lib/hadoop-ozone-filesystem-lib-current-VERSION.jar
  * share/ozone/lib/hadoop-ozone-filesystem-lib-legacy-VERSION.jar
 
  The first one contains all the required dependency to use ozonefs with a
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
index fae68397c25..ab5d2ecd823 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
@@ -125,13 +125,29 @@ public final class ServerUtils {
    * @return
    */
   public static File getScmDbDir(Configuration conf) {
-    final Collection<String> metadirs = conf.getTrimmedStringCollection(
-        ScmConfigKeys.OZONE_SCM_DB_DIRS);
+
+    File metadataDir = getDirWithFallBackToOzoneMetadata(conf, ScmConfigKeys
+        .OZONE_SCM_DB_DIRS, "SCM");
+    if (metadataDir != null) {
+      return metadataDir;
+    }
+
+    LOG.warn("{} is not configured. We recommend adding this setting. " +
+        "Falling back to {} instead.",
+        ScmConfigKeys.OZONE_SCM_DB_DIRS, HddsConfigKeys.OZONE_METADATA_DIRS);
+    return getOzoneMetaDirPath(conf);
+  }
+
+  public static File getDirWithFallBackToOzoneMetadata(Configuration conf,
+                                                       String key,
+                                                       String componentName) {
+    final Collection<String> metadirs = conf.getTrimmedStringCollection(key);
 
     if (metadirs.size() > 1) {
       throw new IllegalArgumentException(
-          "Bad config setting " + ScmConfigKeys.OZONE_SCM_DB_DIRS +
-          ". SCM does not support multiple metadata dirs currently");
+          "Bad config setting " + key +
+              ". " + componentName +
+              " does not support multiple metadata dirs currently");
     }
 
     if (metadirs.size() == 1) {
@@ -143,11 +159,7 @@ public final class ServerUtils {
       }
       return dbDirPath;
     }
-
-    LOG.warn("{} is not configured. We recommend adding this setting. " +
-        "Falling back to {} instead.",
-        ScmConfigKeys.OZONE_SCM_DB_DIRS, HddsConfigKeys.OZONE_METADATA_DIRS);
-    return getOzoneMetaDirPath(conf);
+    return null;
   }
 
   /**
diff --git a/hadoop-hdds/framework/src/main/resources/webapps/static/ozone.js b/hadoop-hdds/framework/src/main/resources/webapps/static/ozone.js
index c2ed2adce2f..a31078cfd7b 100644
--- a/hadoop-hdds/framework/src/main/resources/webapps/static/ozone.js
+++ b/hadoop-hdds/framework/src/main/resources/webapps/static/ozone.js
@@ -308,7 +308,6 @@
             ctrl.convertToArray(response.data);
             ctrl.configs = Object.values(ctrl.keyTagMap);
             ctrl.component = 'All';
-            console.log("ajay -> " + JSON.stringify(ctrl.configs));
             ctrl.sortBy('name');
           });
       };
@@ -326,7 +325,6 @@
 
           if (ctrl.component != 'All' && (item['tag'].indexOf(ctrl
               .component) < 0)) {
-            console.log(item['name'] + " false tag " + item['tag']);
             return false;
           }
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java
index f9aa0cd4f72..a12a49d4a76 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManager.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hdds.scm.block;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.client.BlockID;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -36,11 +37,14 @@ public interface BlockManager extends Closeable {
    * @param size - Block Size
    * @param type Replication Type
    * @param factor - Replication Factor
+   * @param excludeList List of datanodes/containers to exclude during block
+   *                    allocation.
    * @return AllocatedBlock
    * @throws IOException
    */
   AllocatedBlock allocateBlock(long size, HddsProtos.ReplicationType type,
-      HddsProtos.ReplicationFactor factor, String owner) throws IOException;
+      HddsProtos.ReplicationFactor factor, String owner,
+      ExcludeList excludeList) throws IOException;
 
   /**
    * Deletes a list of blocks in an atomic operation. Internally, SCM
@@ -75,4 +79,11 @@ public interface BlockManager extends Closeable {
    * @return the block deleting service executed in SCM.
    */
   SCMBlockDeletingService getSCMBlockDeletingService();
+
+  /**
+   * Set ChillMode status.
+   *
+   * @param chillModeStatus
+   */
+  void setChillModeStatus(boolean chillModeStatus);
 }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
index dea7c020f6c..35ddf18aeb3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
@@ -35,9 +35,11 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ScmOps;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.hdds.scm.ScmUtils;
 import org.apache.hadoop.hdds.scm.chillmode.ChillModePrecheck;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
 import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.container.ContainerManager;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
@@ -60,10 +62,11 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys
     .OZONE_BLOCK_DELETING_SERVICE_TIMEOUT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys
     .OZONE_BLOCK_DELETING_SERVICE_TIMEOUT_DEFAULT;
+import java.util.function.Predicate;
+
 
 /** Block Manager manages the block access for SCM. */
-public class BlockManagerImpl implements EventHandler<Boolean>,
-    BlockManager, BlockmanagerMXBean {
+public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean {
   private static final Logger LOG =
       LoggerFactory.getLogger(BlockManagerImpl.class);
   // TODO : FIX ME : Hard coding the owner.
@@ -145,12 +148,14 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
    * @param size - Block Size
    * @param type Replication Type
    * @param factor - Replication Factor
+   * @param excludeList List of datanodes/containers to exclude during block
+   *                    allocation.
    * @return Allocated block
    * @throws IOException on failure.
    */
   @Override
-  public AllocatedBlock allocateBlock(final long size,
-      ReplicationType type, ReplicationFactor factor, String owner)
+  public AllocatedBlock allocateBlock(final long size, ReplicationType type,
+      ReplicationFactor factor, String owner, ExcludeList excludeList)
       throws IOException {
     LOG.trace("Size;{} , type : {}, factor : {} ", size, type, factor);
     ScmUtils.preCheck(ScmOps.allocateBlock, chillModePrecheck);
@@ -177,8 +182,10 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
     ContainerInfo containerInfo;
 
     while (true) {
-      List<Pipeline> availablePipelines = pipelineManager
-          .getPipelines(type, factor, Pipeline.PipelineState.OPEN);
+      List<Pipeline> availablePipelines =
+          pipelineManager
+              .getPipelines(type, factor, Pipeline.PipelineState.OPEN,
+                  excludeList.getDatanodes(), excludeList.getPipelineIds());
       Pipeline pipeline;
       if (availablePipelines.size() == 0) {
         try {
@@ -197,7 +204,13 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
       // look for OPEN containers that match the criteria.
       containerInfo = containerManager
           .getMatchingContainer(size, owner, pipeline);
-      if (containerInfo != null) {
+
+      // TODO: if getMachingContainer results in containers which are in exclude
+      // list, we may end up in this loop forever. This case needs to be
+      // addressed.
+      if (containerInfo != null && (excludeList.getContainerIds() == null
+          || !discardContainer(containerInfo.containerID(),
+          excludeList.getContainerIds()))) {
         return newBlock(containerInfo);
       }
     }
@@ -210,6 +223,11 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
     return null;
   }
 
+  private boolean discardContainer(ContainerID containerId,
+      List<ContainerID> containers) {
+    Predicate<ContainerID> predicate = p -> p.equals(containerId);
+    return containers.parallelStream().anyMatch(predicate);
+  }
   /**
    * newBlock - returns a new block assigned to a container.
    *
@@ -318,8 +336,8 @@ public class BlockManagerImpl implements EventHandler<Boolean>,
   }
 
   @Override
-  public void onMessage(Boolean inChillMode, EventPublisher publisher) {
-    this.chillModePrecheck.setInChillMode(inChillMode);
+  public void setChillModeStatus(boolean chillModeStatus) {
+    this.chillModePrecheck.setInChillMode(chillModeStatus);
   }
 
   /**
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java
new file mode 100644
index 00000000000..95e0d93a63c
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ChillModeHandler.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * <p>Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.hadoop.hdds.scm.chillmode;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.scm.block.BlockManager;
+import org.apache.hadoop.hdds.scm.container.replication.
+    ReplicationActivityStatus;
+import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager.ChillModeStatus;
+import org.apache.hadoop.hdds.server.events.EventHandler;
+import org.apache.hadoop.hdds.server.events.EventPublisher;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Class to handle the activities needed to be performed after exiting chill
+ * mode.
+ */
+public class ChillModeHandler implements EventHandler<ChillModeStatus> {
+
+  private final SCMClientProtocolServer scmClientProtocolServer;
+  private final BlockManager scmBlockManager;
+  private final long waitTime;
+  private final AtomicBoolean isInChillMode = new AtomicBoolean(true);
+  private final ReplicationActivityStatus replicationActivityStatus;
+
+
+  /**
+   * ChillModeHandler, to handle the logic once we exit chill mode.
+   * @param configuration
+   * @param clientProtocolServer
+   * @param blockManager
+   * @param replicationStatus
+   */
+  public ChillModeHandler(Configuration configuration,
+      SCMClientProtocolServer clientProtocolServer,
+      BlockManager blockManager,
+      ReplicationActivityStatus replicationStatus) {
+    Objects.requireNonNull(configuration, "Configuration cannot be null");
+    Objects.requireNonNull(clientProtocolServer, "SCMClientProtocolServer " +
+        "object cannot be null");
+    Objects.requireNonNull(blockManager, "BlockManager object cannot be null");
+    Objects.requireNonNull(replicationStatus, "ReplicationActivityStatus " +
+        "object cannot be null");
+    this.waitTime = configuration.getTimeDuration(
+        HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT,
+        HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT_DEFAULT,
+        TimeUnit.MILLISECONDS);
+    scmClientProtocolServer = clientProtocolServer;
+    scmBlockManager = blockManager;
+    replicationActivityStatus = replicationStatus;
+
+    boolean chillModeEnabled = configuration.getBoolean(
+        HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED,
+        HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED_DEFAULT);
+    isInChillMode.set(chillModeEnabled);
+
+  }
+
+  /**
+   * Set ChillMode status based on
+   * {@link org.apache.hadoop.hdds.scm.events.SCMEvents#CHILL_MODE_STATUS}.
+   *
+   * Inform BlockManager, ScmClientProtocolServer and replicationAcitivity
+   * status about chillMode status.
+   *
+   * @param chillModeStatus
+   * @param publisher
+   */
+  @Override
+  public void onMessage(ChillModeStatus chillModeStatus,
+      EventPublisher publisher) {
+    isInChillMode.set(chillModeStatus.getChillModeStatus());
+
+    replicationActivityStatus.fireReplicationStart(isInChillMode.get(),
+        waitTime);
+    scmClientProtocolServer.setChillModeStatus(isInChillMode.get());
+    scmBlockManager.setChillModeStatus(isInChillMode.get());
+
+  }
+
+  public boolean getChillModeStatus() {
+    return isInChillMode.get();
+  }
+
+
+}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ContainerChillModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ContainerChillModeRule.java
index 95785323e33..17dd4969155 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ContainerChillModeRule.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/ContainerChillModeRule.java
@@ -29,12 +29,15 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport;
 
 import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hdds.server.events.EventHandler;
+import org.apache.hadoop.hdds.server.events.EventPublisher;
 
 /**
  * Class defining Chill mode exit criteria for Containers.
  */
 public class ContainerChillModeRule implements
-    ChillModeExitRule<NodeRegistrationContainerReport> {
+    ChillModeExitRule<NodeRegistrationContainerReport>,
+    EventHandler<NodeRegistrationContainerReport> {
 
   // Required cutoff % for containers with at least 1 reported replica.
   private double chillModeCutoff;
@@ -68,9 +71,6 @@ public class ContainerChillModeRule implements
 
   @Override
   public boolean validate() {
-    if (maxContainer == 0) {
-      return true;
-    }
     return getCurrentContainerThreshold() >= chillModeCutoff;
   }
 
@@ -84,10 +84,6 @@ public class ContainerChillModeRule implements
 
   @Override
   public void process(NodeRegistrationContainerReport reportsProto) {
-    if (maxContainer == 0) {
-      // No container to check.
-      return;
-    }
 
     reportsProto.getReport().getReportsList().forEach(c -> {
       if (containerMap.containsKey(c.getContainerID())) {
@@ -96,12 +92,33 @@ public class ContainerChillModeRule implements
         }
       }
     });
-    if(chillModeManager.getInChillMode()) {
-      SCMChillModeManager.getLogger().info(
-          "SCM in chill mode. {} % containers have at least one"
-              + " reported replica.",
-          (containerWithMinReplicas.get() / maxContainer) * 100);
+  }
+
+  @Override
+  public void onMessage(NodeRegistrationContainerReport
+      nodeRegistrationContainerReport, EventPublisher publisher) {
+
+    // TODO: when we have remove handlers, we can remove getInChillmode check
+
+    if (chillModeManager.getInChillMode()) {
+      if (validate()) {
+        return;
+      }
+
+      process(nodeRegistrationContainerReport);
+      if (chillModeManager.getInChillMode()) {
+        SCMChillModeManager.getLogger().info(
+            "SCM in chill mode. {} % containers have at least one"
+                + " reported replica.",
+            (containerWithMinReplicas.get() / maxContainer) * 100);
+      }
+
+      if (validate()) {
+        chillModeManager.validateChillModeExitRules(publisher);
+      }
+
     }
+
   }
 
   @Override
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/DataNodeChillModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/DataNodeChillModeRule.java
index 39505056c89..be99962908c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/DataNodeChillModeRule.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/DataNodeChillModeRule.java
@@ -25,13 +25,16 @@ import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer.NodeRegistrationContainerReport;
 
 import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hdds.server.events.EventHandler;
+import org.apache.hadoop.hdds.server.events.EventPublisher;
 
 /**
  * Class defining Chill mode exit criteria according to number of DataNodes
  * registered with SCM.
  */
 public class DataNodeChillModeRule implements
-    ChillModeExitRule<NodeRegistrationContainerReport> {
+    ChillModeExitRule<NodeRegistrationContainerReport>,
+    EventHandler<NodeRegistrationContainerReport> {
 
   // Min DataNodes required to exit chill mode.
   private int requiredDns;
@@ -62,17 +65,33 @@ public class DataNodeChillModeRule implements
 
   @Override
   public void process(NodeRegistrationContainerReport reportsProto) {
-    if (requiredDns == 0) {
-      // No dn check required.
-      return;
-    }
 
-    if(chillModeManager.getInChillMode()) {
-      registeredDnSet.add(reportsProto.getDatanodeDetails().getUuid());
-      registeredDns = registeredDnSet.size();
-      SCMChillModeManager.getLogger().info(
-          "SCM in chill mode. {} DataNodes registered, {} required.",
-          registeredDns, requiredDns);
+    registeredDnSet.add(reportsProto.getDatanodeDetails().getUuid());
+    registeredDns = registeredDnSet.size();
+
+  }
+
+  @Override
+  public void onMessage(NodeRegistrationContainerReport
+      nodeRegistrationContainerReport, EventPublisher publisher) {
+    // TODO: when we have remove handlers, we can remove getInChillmode check
+
+    if (chillModeManager.getInChillMode()) {
+      if (validate()) {
+        return;
+      }
+
+      process(nodeRegistrationContainerReport);
+
+      if (chillModeManager.getInChillMode()) {
+        SCMChillModeManager.getLogger().info(
+            "SCM in chill mode. {} DataNodes registered, {} required.",
+            registeredDns, requiredDns);
+      }
+
+      if (validate()) {
+        chillModeManager.validateChillModeExitRules(publisher);
+      }
     }
   }
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/OneReplicaPipelineChillModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/OneReplicaPipelineChillModeRule.java
new file mode 100644
index 00000000000..20b35b8b112
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/OneReplicaPipelineChillModeRule.java
@@ -0,0 +1,142 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.hadoop.hdds.scm.chillmode;
+
+import com.google.common.base.Preconditions;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.PipelineReport;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException;
+import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.
+    PipelineReportFromDatanode;
+import org.apache.hadoop.hdds.server.events.EventHandler;
+import org.apache.hadoop.hdds.server.events.EventPublisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * This rule covers whether we have atleast one datanode is reported for each
+ * pipeline. This rule is for all open containers, we have at least one
+ * replica available for read when we exit chill mode.
+ */
+public class OneReplicaPipelineChillModeRule implements
+    ChillModeExitRule<PipelineReportFromDatanode>,
+    EventHandler<PipelineReportFromDatanode> {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(OneReplicaPipelineChillModeRule.class);
+
+  private int thresholdCount;
+  private Set<PipelineID> reportedPipelineIDSet = new HashSet<>();
+  private final PipelineManager pipelineManager;
+  private final SCMChillModeManager chillModeManager;
+
+  public OneReplicaPipelineChillModeRule(PipelineManager pipelineManager,
+      SCMChillModeManager chillModeManager,
+      Configuration configuration) {
+    this.chillModeManager = chillModeManager;
+    this.pipelineManager = pipelineManager;
+
+    double percent =
+        configuration.getDouble(
+            HddsConfigKeys.HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT,
+            HddsConfigKeys.
+                HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT_DEFAULT);
+
+    int totalPipelineCount =
+        pipelineManager.getPipelines(HddsProtos.ReplicationType.RATIS,
+            HddsProtos.ReplicationFactor.THREE).size();
+
+    thresholdCount = (int) Math.ceil(percent * totalPipelineCount);
+
+    LOG.info(" Total pipeline count is {}, pipeline's with atleast one " +
+        "datanode reported threshold count is {}", totalPipelineCount,
+        thresholdCount);
+
+  }
+  @Override
+  public boolean validate() {
+    if (reportedPipelineIDSet.size() >= thresholdCount) {
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public void process(PipelineReportFromDatanode pipelineReportFromDatanode) {
+    Pipeline pipeline;
+    Preconditions.checkNotNull(pipelineReportFromDatanode);
+    PipelineReportsProto pipelineReport =
+        pipelineReportFromDatanode.getReport();
+
+    for (PipelineReport report : pipelineReport.getPipelineReportList()) {
+      PipelineID pipelineID = PipelineID
+          .getFromProtobuf(report.getPipelineID());
+      try {
+        pipeline = pipelineManager.getPipeline(pipelineID);
+      } catch (PipelineNotFoundException e) {
+        continue;
+      }
+
+      if (pipeline.getFactor() == HddsProtos.ReplicationFactor.THREE &&
+          !reportedPipelineIDSet.contains(pipelineID)) {
+        reportedPipelineIDSet.add(pipelineID);
+      }
+    }
+  }
+
+  @Override
+  public void cleanup() {
+    reportedPipelineIDSet.clear();
+  }
+
+  @Override
+  public void onMessage(PipelineReportFromDatanode pipelineReportFromDatanode,
+      EventPublisher publisher) {
+
+    if (validate()) {
+      chillModeManager.validateChillModeExitRules(publisher);
+      return;
+    }
+
+    // Process pipeline report from datanode
+    process(pipelineReportFromDatanode);
+
+    if (chillModeManager.getInChillMode()) {
+      SCMChillModeManager.getLogger().info(
+          "SCM in chill mode. Pipelines with atleast one datanode reported " +
+              "count is {}, required atleast one datanode reported per " +
+              "pipeline count is {}",
+          reportedPipelineIDSet.size(), thresholdCount);
+    }
+
+    if (validate()) {
+      chillModeManager.validateChillModeExitRules(publisher);
+    }
+  }
+}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java
index ba79af729c6..849a65695ca 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/chillmode/SCMChillModeManager.java
@@ -28,9 +28,6 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
 import org.apache.hadoop.hdds.scm.pipeline.RatisPipelineUtils;
-import org.apache.hadoop.hdds.scm.server.SCMDatanodeProtocolServer
-    .NodeRegistrationContainerReport;
-import org.apache.hadoop.hdds.server.events.EventHandler;
 import org.apache.hadoop.hdds.server.events.EventPublisher;
 import org.apache.hadoop.hdds.server.events.EventQueue;
 import org.slf4j.Logger;
@@ -48,8 +45,7 @@ import org.slf4j.LoggerFactory;
  * for reported containers and validates if cutoff threshold for
  * containers is meet.
  */
-public class SCMChillModeManager implements
-    EventHandler<NodeRegistrationContainerReport> {
+public class SCMChillModeManager {
 
   private static final Logger LOG =
       LoggerFactory.getLogger(SCMChillModeManager.class);
@@ -62,6 +58,8 @@ public class SCMChillModeManager implements
   private static final String DN_EXIT_RULE = "DataNodeChillModeRule";
   private static final String HEALTHY_PIPELINE_EXIT_RULE =
       "HealthyPipelineChillModeRule";
+  private static final String ATLEAST_ONE_DATANODE_REPORTED_PIPELINE_EXIT_RULE =
+      "AtleastOneDatanodeReportedRule";
 
   private final EventQueue eventPublisher;
   private final PipelineManager pipelineManager;
@@ -75,10 +73,18 @@ public class SCMChillModeManager implements
     this.isChillModeEnabled = conf.getBoolean(
         HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED,
         HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED_DEFAULT);
+
     if (isChillModeEnabled) {
-      exitRules.put(CONT_EXIT_RULE,
-          new ContainerChillModeRule(config, allContainers, this));
-      exitRules.put(DN_EXIT_RULE, new DataNodeChillModeRule(config, this));
+      ContainerChillModeRule containerChillModeRule =
+          new ContainerChillModeRule(config, allContainers, this);
+      DataNodeChillModeRule dataNodeChillModeRule =
+          new DataNodeChillModeRule(config, this);
+      exitRules.put(CONT_EXIT_RULE, containerChillModeRule);
+      exitRules.put(DN_EXIT_RULE, dataNodeChillModeRule);
+      eventPublisher.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
+          containerChillModeRule);
+      eventPublisher.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
+          dataNodeChillModeRule);
 
       if (conf.getBoolean(
           HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK,
@@ -86,8 +92,14 @@ public class SCMChillModeManager implements
           && pipelineManager != null) {
         HealthyPipelineChillModeRule rule = new HealthyPipelineChillModeRule(
             pipelineManager, this, config);
+        OneReplicaPipelineChillModeRule oneReplicaPipelineChillModeRule =
+            new OneReplicaPipelineChillModeRule(pipelineManager, this, conf);
         exitRules.put(HEALTHY_PIPELINE_EXIT_RULE, rule);
+        exitRules.put(ATLEAST_ONE_DATANODE_REPORTED_PIPELINE_EXIT_RULE,
+            oneReplicaPipelineChillModeRule);
         eventPublisher.addHandler(SCMEvents.PROCESSED_PIPELINE_REPORT, rule);
+        eventPublisher.addHandler(SCMEvents.PROCESSED_PIPELINE_REPORT,
+            oneReplicaPipelineChillModeRule);
       }
       emitChillModeStatus();
     } else {
@@ -100,7 +112,8 @@ public class SCMChillModeManager implements
    */
   @VisibleForTesting
   public void emitChillModeStatus() {
-    eventPublisher.fireEvent(SCMEvents.CHILL_MODE_STATUS, getInChillMode());
+    eventPublisher.fireEvent(SCMEvents.CHILL_MODE_STATUS,
+        new ChillModeStatus(getInChillMode()));
   }
 
   public void validateChillModeExitRules(EventPublisher eventQueue) {
@@ -138,17 +151,6 @@ public class SCMChillModeManager implements
         .scheduleFixedIntervalPipelineCreator(pipelineManager, config);
   }
 
-  @Override
-  public void onMessage(
-      NodeRegistrationContainerReport nodeRegistrationContainerReport,
-      EventPublisher publisher) {
-    if (getInChillMode()) {
-      exitRules.get(CONT_EXIT_RULE).process(nodeRegistrationContainerReport);
-      exitRules.get(DN_EXIT_RULE).process(nodeRegistrationContainerReport);
-      validateChillModeExitRules(publisher);
-    }
-  }
-
   public boolean getInChillMode() {
     if (!isChillModeEnabled) {
       return false;
@@ -179,4 +181,26 @@ public class SCMChillModeManager implements
         exitRules.get(HEALTHY_PIPELINE_EXIT_RULE);
   }
 
+  @VisibleForTesting
+  public OneReplicaPipelineChillModeRule getOneReplicaPipelineChillModeRule() {
+    return (OneReplicaPipelineChillModeRule)
+        exitRules.get(ATLEAST_ONE_DATANODE_REPORTED_PIPELINE_EXIT_RULE);
+  }
+
+
+  /**
+   * Class used during ChillMode status event.
+   */
+  public static class ChillModeStatus {
+
+    private boolean chillModeStatus;
+    public ChillModeStatus(boolean chillModeState) {
+      this.chillModeStatus = chillModeState;
+    }
+
+    public boolean getChillModeStatus() {
+      return chillModeStatus;
+    }
+  }
+
 }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java
index 5a2e2b112d2..9de06700f28 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationActivityStatus.java
@@ -20,11 +20,13 @@ package org.apache.hadoop.hdds.scm.container.replication;
 import javax.management.ObjectName;
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.hadoop.hdds.server.events.EventHandler;
-import org.apache.hadoop.hdds.server.events.EventPublisher;
+
+import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.metrics2.util.MBeans;
 
+
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,15 +41,8 @@ public class ReplicationActivityStatus implements
       LoggerFactory.getLogger(ReplicationActivityStatus.class);
 
   private AtomicBoolean replicationEnabled = new AtomicBoolean();
-  private AtomicBoolean replicationStatusSetExternally = new AtomicBoolean();
   private ObjectName jmxObjectName;
-  private ReplicationStatusListener replicationStatusListener;
-  private ChillModeStatusListener chillModeStatusListener;
 
-  public ReplicationActivityStatus(){
-    replicationStatusListener = new ReplicationStatusListener();
-    chillModeStatusListener = new ChillModeStatusListener();
-  }
   @Override
   public boolean isReplicationEnabled() {
     return replicationEnabled.get();
@@ -84,35 +79,26 @@ public class ReplicationActivityStatus implements
   }
 
   /**
-   * Replication status listener.
+   * Waits for
+   * {@link HddsConfigKeys#HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT} and set
+   * replicationEnabled to start replication monitor thread.
    */
-  class ReplicationStatusListener implements EventHandler<Boolean> {
-    @Override
-    public void onMessage(Boolean status, EventPublisher publisher) {
-      replicationStatusSetExternally.set(true);
-      replicationEnabled.set(status);
+  public void fireReplicationStart(boolean chillModeStatus,
+      long waitTime) {
+    if (!chillModeStatus) {
+      CompletableFuture.runAsync(() -> {
+        try {
+          Thread.sleep(waitTime);
+        } catch (InterruptedException ex) {
+          LOG.error("Interrupted during wait, replication event is not fired",
+              ex);
+        }
+        setReplicationEnabled(true);
+        LOG.info("Replication Timer sleep for {} ms completed. Enable " +
+            "Replication", waitTime);
+      });
     }
   }
 
-  /**
-   * Replication status is influenced by Chill mode status as well.
-   */
-  class ChillModeStatusListener implements EventHandler<Boolean> {
-
-    @Override
-    public void onMessage(Boolean inChillMode, EventPublisher publisher) {
-      if (!replicationStatusSetExternally.get()) {
-        replicationEnabled.set(!inChillMode);
-      }
-    }
-  }
-
-  public ReplicationStatusListener getReplicationStatusListener() {
-    return replicationStatusListener;
-  }
-
-  public ChillModeStatusListener getChillModeStatusListener() {
-    return chillModeStatusListener;
-  }
 
 }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
index 0eb8e1861a4..5be512ba63e 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hdds.scm.events;
 
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.scm.block.PendingDeleteStatusList;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager.ChillModeStatus;
 import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler;
 import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler
     .ReplicationStatus;
@@ -253,8 +254,8 @@ public final class SCMEvents {
    */
   public static final TypedEvent<Boolean> START_REPLICATION =
       new TypedEvent<>(Boolean.class);
-  public static final TypedEvent<Boolean> CHILL_MODE_STATUS =
-      new TypedEvent<>(Boolean.class);
+  public static final TypedEvent<ChillModeStatus> CHILL_MODE_STATUS =
+      new TypedEvent<>(ChillModeStatus.class);
 
   /**
    * Private Ctor. Never Constructed.
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java
index 6774b7f03fb..9a846adaf4b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineFactory.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hdds.scm.pipeline;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
@@ -45,6 +46,12 @@ public final class PipelineFactory {
         new RatisPipelineProvider(nodeManager, stateManager, conf));
   }
 
+  @VisibleForTesting
+  void setProvider(ReplicationType replicationType,
+                     PipelineProvider provider) {
+    providers.put(replicationType, provider);
+  }
+
   public Pipeline create(ReplicationType type, ReplicationFactor factor)
       throws IOException {
     return providers.get(type).create(factor);
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java
index e360e7b0649..11ba2c3b0af 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManager.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.scm.container.ContainerID;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.NavigableSet;
 
@@ -51,6 +52,10 @@ public interface PipelineManager extends Closeable, PipelineManagerMXBean {
   List<Pipeline> getPipelines(ReplicationType type,
       ReplicationFactor factor, Pipeline.PipelineState state);
 
+  List<Pipeline> getPipelines(ReplicationType type, ReplicationFactor factor,
+      Pipeline.PipelineState state, Collection<DatanodeDetails> excludeDns,
+      Collection<PipelineID> excludePipelines);
+
   void addContainerToPipeline(PipelineID pipelineID, ContainerID containerID)
       throws IOException;
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
index a0ef964fb21..6be747b7e85 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hdds.scm.pipeline;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.scm.container.ContainerID;
@@ -27,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.NavigableSet;
 
@@ -81,6 +83,13 @@ class PipelineStateManager {
     return pipelineStateMap.getPipelines(type, factor, state);
   }
 
+  List<Pipeline> getPipelines(ReplicationType type, ReplicationFactor factor,
+      PipelineState state, Collection<DatanodeDetails> excludeDns,
+      Collection<PipelineID> excludePipelines) {
+    return pipelineStateMap
+        .getPipelines(type, factor, state, excludeDns, excludePipelines);
+  }
+
   List<Pipeline> getPipelines(ReplicationType type, PipelineState... states) {
     return pipelineStateMap.getPipelines(type, states);
   }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
index 8e0b62bacc9..6fc27a6cdb5 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hdds.scm.pipeline;
 import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
 import org.apache.hadoop.hdds.scm.container.ContainerID;
@@ -30,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -217,6 +219,57 @@ class PipelineStateMap {
         .collect(Collectors.toList());
   }
 
+  /**
+   * Get list of pipeline corresponding to specified replication type,
+   * replication factor and pipeline state.
+   *
+   * @param type - ReplicationType
+   * @param state - Required PipelineState
+   * @param excludeDns list of dns to exclude
+   * @param excludePipelines pipelines to exclude
+   * @return List of pipelines with specified replication type,
+   * replication factor and pipeline state
+   */
+  List<Pipeline> getPipelines(ReplicationType type, ReplicationFactor factor,
+      PipelineState state, Collection<DatanodeDetails> excludeDns,
+      Collection<PipelineID> excludePipelines) {
+    Preconditions.checkNotNull(type, "Replication type cannot be null");
+    Preconditions.checkNotNull(factor, "Replication factor cannot be null");
+    Preconditions.checkNotNull(state, "Pipeline state cannot be null");
+    Preconditions
+        .checkNotNull(excludeDns, "Datanode exclude list cannot be null");
+    Preconditions
+        .checkNotNull(excludeDns, "Pipeline exclude list cannot be null");
+    return getPipelines(type, factor, state).stream().filter(
+        pipeline -> !discardPipeline(pipeline, excludePipelines)
+            && !discardDatanode(pipeline, excludeDns))
+        .collect(Collectors.toList());
+  }
+
+  private boolean discardPipeline(Pipeline pipeline,
+      Collection<PipelineID> excludePipelines) {
+    if (excludePipelines.isEmpty()) {
+      return false;
+    }
+    Predicate<PipelineID> predicate = p -> p.equals(pipeline.getId());
+    return excludePipelines.parallelStream().anyMatch(predicate);
+  }
+
+  private boolean discardDatanode(Pipeline pipeline,
+      Collection<DatanodeDetails> excludeDns) {
+    if (excludeDns.isEmpty()) {
+      return false;
+    }
+    boolean discard = false;
+    for (DatanodeDetails dn : pipeline.getNodes()) {
+      Predicate<DatanodeDetails> predicate = p -> p.equals(dn);
+      discard = excludeDns.parallelStream().anyMatch(predicate);
+      if (discard) {
+        break;
+      }
+    }
+    return discard;
+  }
   /**
    * Get set of containerIDs corresponding to a pipeline.
    *
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
index 6126d580c24..b73f63d9702 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
@@ -143,7 +143,7 @@ public class RatisPipelineProvider implements PipelineProvider {
         .build();
   }
 
-  private void initializePipeline(Pipeline pipeline) throws IOException {
+  protected void initializePipeline(Pipeline pipeline) throws IOException {
     RatisPipelineUtils.createPipeline(pipeline, conf);
   }
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
index 201c0346652..89dfc0e8599 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineUtils.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.ozone.OzoneConfigKeys;
 import org.apache.ratis.RatisHelper;
 import org.apache.ratis.client.RaftClient;
 import org.apache.ratis.grpc.GrpcTlsConfig;
+import org.apache.ratis.protocol.RaftClientReply;
 import org.apache.ratis.protocol.RaftGroup;
 import org.apache.ratis.protocol.RaftGroupId;
 import org.apache.ratis.protocol.RaftPeer;
@@ -71,7 +72,15 @@ public final class RatisPipelineUtils {
     final RaftGroup group = RatisHelper.newRaftGroup(pipeline);
     LOG.debug("creating pipeline:{} with {}", pipeline.getId(), group);
     callRatisRpc(pipeline.getNodes(), ozoneConf,
-        (raftClient, peer) -> raftClient.groupAdd(group, peer.getId()));
+        (raftClient, peer) -> {
+          RaftClientReply reply = raftClient.groupAdd(group, peer.getId());
+          if (reply == null || !reply.isSuccess()) {
+            String msg = "Pipeline initialization failed for pipeline:"
+                + pipeline.getId() + " node:" + peer.getId();
+            LOG.error(msg);
+            throw new IOException(msg);
+          }
+        });
   }
 
   /**
@@ -186,8 +195,8 @@ public final class RatisPipelineUtils {
         rpc.accept(client, p);
       } catch (IOException ioe) {
         exceptions.add(
-            new IOException("Failed invoke Ratis rpc " + rpc + " for " + d,
-                ioe));
+            new IOException("Failed invoke Ratis rpc " + rpc + " for " +
+                d.getUuid(), ioe));
       }
     });
     if (!exceptions.isEmpty()) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
index 371660742a2..1bb00991ef3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
@@ -45,6 +45,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NavigableSet;
 import java.util.Set;
+import java.util.Collection;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -99,6 +100,15 @@ public class SCMPipelineManager implements PipelineManager {
     initializePipelineState();
   }
 
+  public PipelineStateManager getStateManager() {
+    return stateManager;
+  }
+
+  public void setPipelineProvider(ReplicationType replicationType,
+                                  PipelineProvider provider) {
+    pipelineFactory.setProvider(replicationType, provider);
+  }
+
   private void initializePipelineState() throws IOException {
     if (pipelineStore.isEmpty()) {
       LOG.info("No pipeline exists in current db");
@@ -205,6 +215,20 @@ public class SCMPipelineManager implements PipelineManager {
     }
   }
 
+  @Override
+  public List<Pipeline> getPipelines(ReplicationType type,
+      ReplicationFactor factor, Pipeline.PipelineState state,
+      Collection<DatanodeDetails> excludeDns,
+      Collection<PipelineID> excludePipelines) {
+    lock.readLock().lock();
+    try {
+      return stateManager
+          .getPipelines(type, factor, state, excludeDns, excludePipelines);
+    } finally {
+      lock.readLock().unlock();
+    }
+  }
+
   @Override
   public void addContainerToPipeline(PipelineID pipelineID,
       ContainerID containerID) throws IOException {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
index 1d7b59d8ac7..52cb0454dd7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMBlockProtocolServer.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hdds.scm.HddsServerUtil;
 import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
 import org.apache.hadoop.hdds.scm.container.common.helpers.DeleteBlockResult;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolPB;
@@ -155,9 +156,9 @@ public class SCMBlockProtocolServer implements
   }
 
   @Override
-  public AllocatedBlock allocateBlock(long size, HddsProtos.ReplicationType
-      type, HddsProtos.ReplicationFactor factor, String owner) throws
-      IOException {
+  public AllocatedBlock allocateBlock(long size,
+      HddsProtos.ReplicationType type, HddsProtos.ReplicationFactor factor,
+      String owner, ExcludeList excludeList) throws IOException {
     Map<String, String> auditMap = Maps.newHashMap();
     auditMap.put("size", String.valueOf(size));
     auditMap.put("type", type.name());
@@ -165,7 +166,8 @@ public class SCMBlockProtocolServer implements
     auditMap.put("owner", owner);
     boolean auditSuccess = true;
     try {
-      return scm.getScmBlockManager().allocateBlock(size, type, factor, owner);
+      return scm.getScmBlockManager()
+          .allocateBlock(size, type, factor, owner, excludeList);
     } catch (Exception ex) {
       auditSuccess = false;
       AUDIT.logWriteFailure(
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index 2b1022bbd33..46460d20e17 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -49,8 +49,6 @@ import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
 import org.apache.hadoop.hdds.scm.pipeline.RatisPipelineUtils;
 import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolPB;
-import org.apache.hadoop.hdds.server.events.EventHandler;
-import org.apache.hadoop.hdds.server.events.EventPublisher;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ipc.ProtobufRpcEngine;
 import org.apache.hadoop.ipc.RPC;
@@ -95,7 +93,7 @@ import static org.apache.hadoop.hdds.scm.server.StorageContainerManager
  * The RPC server that listens to requests from clients.
  */
 public class SCMClientProtocolServer implements
-    StorageContainerLocationProtocol, EventHandler<Boolean>, Auditor {
+    StorageContainerLocationProtocol, Auditor {
   private static final Logger LOG =
       LoggerFactory.getLogger(SCMClientProtocolServer.class);
   private static final AuditLogger AUDIT =
@@ -496,14 +494,6 @@ public class SCMClientProtocolServer implements
     return scm;
   }
 
-  /**
-   * Set chill mode status based on SCMEvents.CHILL_MODE_STATUS event.
-   */
-  @Override
-  public void onMessage(Boolean inChillMode, EventPublisher publisher) {
-    chillModePrecheck.setInChillMode(inChillMode);
-  }
-
   /**
    * Set chill mode status based on .
    */
@@ -561,4 +551,13 @@ public class SCMClientProtocolServer implements
   public void close() throws IOException {
     stop();
   }
+
+  /**
+   * Set ChillMode status.
+   *
+   * @param chillModeStatus
+   */
+  public void setChillModeStatus(boolean chillModeStatus) {
+    chillModePrecheck.setInChillMode(chillModeStatus);
+  }
 }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index fc93235b7b0..684b76f9096 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hdds.scm.block.BlockManager;
 import org.apache.hadoop.hdds.scm.block.BlockManagerImpl;
 import org.apache.hadoop.hdds.scm.block.DeletedBlockLogImpl;
 import org.apache.hadoop.hdds.scm.block.PendingDeleteHandler;
+import org.apache.hadoop.hdds.scm.chillmode.ChillModeHandler;
 import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager;
 import org.apache.hadoop.hdds.scm.command.CommandStatusReportHandler;
 import org.apache.hadoop.hdds.scm.container.CloseContainerEventHandler;
@@ -202,6 +203,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
 
   private JvmPauseMonitor jvmPauseMonitor;
   private final OzoneConfiguration configuration;
+  private final ChillModeHandler chillModeHandler;
 
   /**
    * Creates a new StorageContainerManager. Configuration will be
@@ -336,6 +338,9 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
     clientProtocolServer = new SCMClientProtocolServer(conf, this);
     httpServer = new StorageContainerManagerHttpServer(conf);
 
+    chillModeHandler = new ChillModeHandler(configuration,
+        clientProtocolServer, scmBlockManager, replicationStatus);
+
     eventQueue.addHandler(SCMEvents.DATANODE_COMMAND, scmNodeManager);
     eventQueue.addHandler(SCMEvents.RETRIABLE_DATANODE_COMMAND, scmNodeManager);
     eventQueue.addHandler(SCMEvents.NODE_REPORT, nodeReportHandler);
@@ -350,22 +355,13 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
         nonHealthyToHealthyNodeHandler);
     eventQueue.addHandler(SCMEvents.DEAD_NODE, deadNodeHandler);
     eventQueue.addHandler(SCMEvents.CMD_STATUS_REPORT, cmdStatusReportHandler);
-    eventQueue.addHandler(SCMEvents.START_REPLICATION,
-        replicationStatus.getReplicationStatusListener());
     eventQueue
         .addHandler(SCMEvents.PENDING_DELETE_STATUS, pendingDeleteHandler);
     eventQueue.addHandler(SCMEvents.DELETE_BLOCK_STATUS,
         (DeletedBlockLogImpl) scmBlockManager.getDeletedBlockLog());
     eventQueue.addHandler(SCMEvents.PIPELINE_ACTIONS, pipelineActionHandler);
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, clientProtocolServer);
     eventQueue.addHandler(SCMEvents.PIPELINE_REPORT, pipelineReportHandler);
-
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS,
-        replicationStatus.getChillModeStatusListener());
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS,
-        (BlockManagerImpl) scmBlockManager);
-    eventQueue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-        scmChillModeManager);
+    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler);
     registerMXBean();
   }
 
@@ -1081,6 +1077,11 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
     return scmBlockManager;
   }
 
+  @VisibleForTesting
+  public ChillModeHandler getChillModeHandler() {
+    return chillModeHandler;
+  }
+
   public void checkAdminAccess(String remoteUser) throws IOException {
     if (remoteUser != null) {
       if (!scmAdminUsernames.contains(remoteUser)) {
diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
index de4894ab12b..fedfcdfd1ff 100644
--- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
+++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
@@ -36,25 +36,9 @@
         <td>Datanode Rpc port</td>
         <td>{{$ctrl.overview.jmx.DatanodeRpcPort}}</td>
     </tr>
-    <tr>
-        <td>Block Manager: Open containers</td>
-        <td>{{$ctrl.blockmanagermetrics.OpenContainersNo}}</td>
-    </tr>
-    <tr>
-        <td>Node Manager: Minimum chill mode nodes</td>
-        <td>{{$ctrl.nodemanagermetrics.MinimumChillModeNodes}}</td>
-    </tr>
-    <tr>
-        <td>Node Manager: Out-of-node chill mode</td>
-        <td>{{$ctrl.nodemanagermetrics.OutOfNodeChillMode}}</td>
-    </tr>
     <tr>
         <td>Node Manager: Chill mode status</td>
         <td>{{$ctrl.scmmetrics.InChillMode}}</td>
     </tr>
-    <tr>
-        <td>Node Manager: Manual chill mode</td>
-        <td>{{$ctrl.nodemanagermetrics.InManualChillMode}}</td>
-    </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
index 7c6dc9132c9..2942a561dea 100644
--- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
+++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
@@ -26,10 +26,6 @@
         },
         controller: function ($http) {
             var ctrl = this;
-            $http.get("jmx?qry=Hadoop:service=BlockManager,name=*")
-                .then(function (result) {
-                    ctrl.blockmanagermetrics = result.data.beans[0];
-                });
             $http.get("jmx?qry=Hadoop:service=SCMNodeManager,name=SCMNodeManagerInfo")
                 .then(function (result) {
                     ctrl.nodemanagermetrics = result.data.beans[0];
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
index 625e561e87c..88d9f9b3de7 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
@@ -25,11 +25,13 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.hdds.scm.TestUtils;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager.ChillModeStatus;
 import org.apache.hadoop.hdds.scm.container.CloseContainerEventHandler;
 import org.apache.hadoop.hdds.scm.container.ContainerID;
 import org.apache.hadoop.hdds.scm.container.MockNodeManager;
 import org.apache.hadoop.hdds.scm.container.SCMContainerManager;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
@@ -70,6 +72,7 @@ public class TestBlockManager implements EventHandler<Boolean> {
   private static EventQueue eventQueue;
   private int numContainerPerOwnerInPipeline;
   private OzoneConfiguration conf;
+  private ChillModeStatus chillModeStatus = new ChillModeStatus(false);
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -100,7 +103,7 @@ public class TestBlockManager implements EventHandler<Boolean> {
 
     eventQueue = new EventQueue();
     eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS,
-        (BlockManagerImpl) scm.getScmBlockManager());
+        scm.getChillModeHandler());
     eventQueue.addHandler(SCMEvents.START_REPLICATION, this);
     CloseContainerEventHandler closeContainerHandler =
         new CloseContainerEventHandler(pipelineManager, mapping);
@@ -122,31 +125,32 @@ public class TestBlockManager implements EventHandler<Boolean> {
 
   @Test
   public void testAllocateBlock() throws Exception {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils.waitFor(() -> {
       return !blockManager.isScmInChillMode();
     }, 10, 1000 * 5);
     AllocatedBlock block = blockManager.allocateBlock(DEFAULT_BLOCK_SIZE,
-        type, factor, containerOwner);
+        type, factor, containerOwner, new ExcludeList());
     Assert.assertNotNull(block);
   }
 
   @Test
   public void testAllocateOversizedBlock() throws Exception {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils.waitFor(() -> {
       return !blockManager.isScmInChillMode();
     }, 10, 1000 * 5);
     long size = 6 * GB;
     thrown.expectMessage("Unsupported block size");
     AllocatedBlock block = blockManager.allocateBlock(size,
-        type, factor, containerOwner);
+        type, factor, containerOwner, new ExcludeList());
   }
 
 
   @Test
   public void testAllocateBlockFailureInChillMode() throws Exception {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, true);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS,
+        new ChillModeStatus(true));
     GenericTestUtils.waitFor(() -> {
       return blockManager.isScmInChillMode();
     }, 10, 1000 * 5);
@@ -154,24 +158,24 @@ public class TestBlockManager implements EventHandler<Boolean> {
     thrown.expectMessage("ChillModePrecheck failed for "
         + "allocateBlock");
     blockManager.allocateBlock(DEFAULT_BLOCK_SIZE,
-        type, factor, containerOwner);
+        type, factor, containerOwner, new ExcludeList());
   }
 
   @Test
   public void testAllocateBlockSucInChillMode() throws Exception {
     // Test2: Exit chill mode and then try allocateBock again.
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils.waitFor(() -> {
       return !blockManager.isScmInChillMode();
     }, 10, 1000 * 5);
     Assert.assertNotNull(blockManager.allocateBlock(DEFAULT_BLOCK_SIZE,
-        type, factor, containerOwner));
+        type, factor, containerOwner, new ExcludeList()));
   }
 
   @Test(timeout = 10000)
   public void testMultipleBlockAllocation()
       throws IOException, TimeoutException, InterruptedException {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils
         .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5);
 
@@ -179,12 +183,14 @@ public class TestBlockManager implements EventHandler<Boolean> {
     pipelineManager.createPipeline(type, factor);
 
     AllocatedBlock allocatedBlock = blockManager
-        .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner);
+        .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner,
+            new ExcludeList());
     // block should be allocated in different pipelines
     GenericTestUtils.waitFor(() -> {
       try {
         AllocatedBlock block = blockManager
-            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner);
+            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner,
+                new ExcludeList());
         return !block.getPipeline().getId()
             .equals(allocatedBlock.getPipeline().getId());
       } catch (IOException e) {
@@ -211,7 +217,7 @@ public class TestBlockManager implements EventHandler<Boolean> {
   @Test(timeout = 10000)
   public void testMultipleBlockAllocationWithClosedContainer()
       throws IOException, TimeoutException, InterruptedException {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils
         .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5);
 
@@ -227,7 +233,8 @@ public class TestBlockManager implements EventHandler<Boolean> {
     GenericTestUtils.waitFor(() -> {
       try {
         blockManager
-            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner);
+            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner,
+                new ExcludeList());
       } catch (IOException e) {
       }
       return verifyNumberOfContainersInPipelines(
@@ -250,7 +257,8 @@ public class TestBlockManager implements EventHandler<Boolean> {
     GenericTestUtils.waitFor(() -> {
       try {
         blockManager
-            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner);
+            .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner,
+                new ExcludeList());
       } catch (IOException e) {
       }
       return verifyNumberOfContainersInPipelines(
@@ -261,7 +269,7 @@ public class TestBlockManager implements EventHandler<Boolean> {
   @Test(timeout = 10000)
   public void testBlockAllocationWithNoAvailablePipelines()
       throws IOException, TimeoutException, InterruptedException {
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
     GenericTestUtils
         .waitFor(() -> !blockManager.isScmInChillMode(), 10, 1000 * 5);
 
@@ -271,7 +279,8 @@ public class TestBlockManager implements EventHandler<Boolean> {
     }
     Assert.assertEquals(0, pipelineManager.getPipelines(type, factor).size());
     Assert.assertNotNull(blockManager
-        .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner));
+        .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, containerOwner,
+            new ExcludeList()));
     Assert.assertEquals(1, pipelineManager.getPipelines(type, factor).size());
   }
 
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java
new file mode 100644
index 00000000000..22a3907a7b5
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestChillModeHandler.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdds.scm.chillmode;
+
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.block.BlockManager;
+import org.apache.hadoop.hdds.scm.block.BlockManagerImpl;
+import org.apache.hadoop.hdds.scm.container.replication.ReplicationActivityStatus;
+import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer;
+import org.apache.hadoop.hdds.server.events.EventQueue;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ * Tests ChillModeHandler behavior.
+ */
+public class TestChillModeHandler {
+
+
+  private OzoneConfiguration configuration;
+  private SCMClientProtocolServer scmClientProtocolServer;
+  private ReplicationActivityStatus replicationActivityStatus;
+  private BlockManager blockManager;
+  private ChillModeHandler chillModeHandler;
+  private EventQueue eventQueue;
+  private SCMChillModeManager.ChillModeStatus chillModeStatus;
+
+  public void setup(boolean enabled) {
+    configuration = new OzoneConfiguration();
+    configuration.setBoolean(HddsConfigKeys.HDDS_SCM_CHILLMODE_ENABLED,
+        enabled);
+    configuration.set(HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT,
+        "3s");
+    scmClientProtocolServer =
+        Mockito.mock(SCMClientProtocolServer.class);
+    replicationActivityStatus =
+        new ReplicationActivityStatus();
+    blockManager = Mockito.mock(BlockManagerImpl.class);
+    chillModeHandler =
+        new ChillModeHandler(configuration, scmClientProtocolServer,
+            blockManager, replicationActivityStatus);
+
+
+    eventQueue = new EventQueue();
+    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler);
+    chillModeStatus = new SCMChillModeManager.ChillModeStatus(false);
+
+  }
+
+  @Test
+  public void testChillModeHandlerWithChillModeEnabled() throws Exception {
+    setup(true);
+
+    Assert.assertTrue(chillModeHandler.getChillModeStatus());
+
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
+
+    GenericTestUtils.waitFor(() -> !chillModeHandler.getChillModeStatus(),
+        1000, 5000);
+
+    Assert.assertFalse(scmClientProtocolServer.getChillModeStatus());
+    Assert.assertFalse(((BlockManagerImpl) blockManager).isScmInChillMode());
+    GenericTestUtils.waitFor(() ->
+            replicationActivityStatus.isReplicationEnabled(), 1000, 5000);
+  }
+
+
+  @Test
+  public void testChillModeHandlerWithChillModeDisbaled() throws Exception{
+
+    setup(false);
+
+    Assert.assertFalse(chillModeHandler.getChillModeStatus());
+
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, chillModeStatus);
+
+    Assert.assertFalse(chillModeHandler.getChillModeStatus());
+    Assert.assertFalse(scmClientProtocolServer.getChillModeStatus());
+    Assert.assertFalse(((BlockManagerImpl) blockManager).isScmInChillMode());
+    GenericTestUtils.waitFor(() ->
+        replicationActivityStatus.isReplicationEnabled(), 1000, 5000);
+  }
+}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestHealthyPipelineChillModeRule.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestHealthyPipelineChillModeRule.java
index 61fbf19e7da..3ee7a7c7d2d 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestHealthyPipelineChillModeRule.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestHealthyPipelineChillModeRule.java
@@ -31,7 +31,8 @@ import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.container.MockNodeManager;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
+import org.apache.hadoop.hdds.scm.pipeline.MockRatisPipelineProvider;
 import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher;
 import org.apache.hadoop.hdds.server.events.EventQueue;
@@ -69,8 +70,13 @@ public class TestHealthyPipelineChillModeRule {
           HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK, true);
 
 
-      PipelineManager pipelineManager = new SCMPipelineManager(config,
+      SCMPipelineManager pipelineManager = new SCMPipelineManager(config,
           nodeManager, eventQueue);
+      PipelineProvider mockRatisProvider =
+          new MockRatisPipelineProvider(nodeManager,
+              pipelineManager.getStateManager(), config);
+      pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+          mockRatisProvider);
       SCMChillModeManager scmChillModeManager = new SCMChillModeManager(
           config, containers, pipelineManager, eventQueue);
 
@@ -109,9 +115,15 @@ public class TestHealthyPipelineChillModeRule {
           HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK, true);
 
 
-      PipelineManager pipelineManager = new SCMPipelineManager(config,
+      SCMPipelineManager pipelineManager = new SCMPipelineManager(config,
           nodeManager, eventQueue);
 
+      PipelineProvider mockRatisProvider =
+          new MockRatisPipelineProvider(nodeManager,
+              pipelineManager.getStateManager(), config);
+      pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+          mockRatisProvider);
+
       // Create 3 pipelines
       Pipeline pipeline1 =
           pipelineManager.createPipeline(HddsProtos.ReplicationType.RATIS,
@@ -178,8 +190,13 @@ public class TestHealthyPipelineChillModeRule {
           HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK, true);
 
 
-      PipelineManager pipelineManager = new SCMPipelineManager(config,
+      SCMPipelineManager pipelineManager = new SCMPipelineManager(config,
           nodeManager, eventQueue);
+      PipelineProvider mockRatisProvider =
+          new MockRatisPipelineProvider(nodeManager,
+              pipelineManager.getStateManager(), config);
+      pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+          mockRatisProvider);
 
       // Create 3 pipelines
       Pipeline pipeline1 =
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestOneReplicaPipelineChillModeRule.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestOneReplicaPipelineChillModeRule.java
new file mode 100644
index 00000000000..ac0d04043b7
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestOneReplicaPipelineChillModeRule.java
@@ -0,0 +1,209 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.hadoop.hdds.scm.chillmode;
+
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.PipelineReport;
+import org.apache.hadoop.hdds.protocol.proto
+    .StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
+import org.apache.hadoop.hdds.scm.HddsTestUtils;
+import org.apache.hadoop.hdds.scm.container.ContainerInfo;
+import org.apache.hadoop.hdds.scm.container.MockNodeManager;
+import org.apache.hadoop.hdds.scm.pipeline.MockRatisPipelineProvider;
+import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
+import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
+import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher;
+import org.apache.hadoop.hdds.server.events.EventQueue;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class tests OneReplicaPipelineChillModeRule.
+ */
+public class TestOneReplicaPipelineChillModeRule {
+
+  @Rule
+  public TemporaryFolder folder = new TemporaryFolder();
+  private OneReplicaPipelineChillModeRule rule;
+  private SCMPipelineManager pipelineManager;
+  private EventQueue eventQueue;
+
+
+  private void setup(int nodes, int pipelineFactorThreeCount,
+      int pipelineFactorOneCount) throws Exception {
+    OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
+    ozoneConfiguration.setBoolean(
+        HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK, true);
+    ozoneConfiguration.set(HddsConfigKeys.OZONE_METADATA_DIRS,
+        folder.newFolder().toString());
+
+    List<ContainerInfo> containers = new ArrayList<>();
+    containers.addAll(HddsTestUtils.getContainerInfo(1));
+    MockNodeManager mockNodeManager = new MockNodeManager(true, nodes);
+
+    eventQueue = new EventQueue();
+    pipelineManager =
+        new SCMPipelineManager(ozoneConfiguration, mockNodeManager,
+            eventQueue);
+
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(mockNodeManager,
+            pipelineManager.getStateManager(), ozoneConfiguration);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
+
+    createPipelines(pipelineFactorThreeCount,
+        HddsProtos.ReplicationFactor.THREE);
+    createPipelines(pipelineFactorOneCount,
+        HddsProtos.ReplicationFactor.ONE);
+
+    SCMChillModeManager scmChillModeManager =
+        new SCMChillModeManager(ozoneConfiguration, containers,
+            pipelineManager, eventQueue);
+
+    rule = scmChillModeManager.getOneReplicaPipelineChillModeRule();
+  }
+
+  @Test
+  public void testOneReplicaPipelineRule() throws Exception {
+
+    // As with 30 nodes, We can create 7 pipelines with replication factor 3.
+    // (This is because in node manager for every 10 nodes, 7 nodes are
+    // healthy, 2 are stale one is dead.)
+    int nodes = 30;
+    int pipelineFactorThreeCount = 7;
+    int pipelineCountOne = 0;
+    setup(nodes, pipelineFactorThreeCount, pipelineCountOne);
+
+    GenericTestUtils.LogCapturer logCapturer =
+        GenericTestUtils.LogCapturer.captureLogs(
+            LoggerFactory.getLogger(SCMChillModeManager.class));
+
+    List<Pipeline> pipelines = pipelineManager.getPipelines();
+    for (int i = 0; i < pipelineFactorThreeCount -1; i++) {
+      firePipelineEvent(pipelines.get(i));
+    }
+
+    // As 90% of 7 with ceil is 7, if we send 6 pipeline reports, rule
+    // validate should be still false.
+
+    GenericTestUtils.waitFor(() -> logCapturer.getOutput().contains(
+        "reported count is 6"), 1000, 5000);
+
+    Assert.assertFalse(rule.validate());
+
+    //Fire last pipeline event from datanode.
+    firePipelineEvent(pipelines.get(pipelineFactorThreeCount - 1));
+
+    GenericTestUtils.waitFor(() -> rule.validate(), 1000, 5000);
+
+  }
+
+
+  @Test
+  public void testOneReplicaPipelineRuleMixedPipelines() throws Exception {
+
+    // As with 30 nodes, We can create 7 pipelines with replication factor 3.
+    // (This is because in node manager for every 10 nodes, 7 nodes are
+    // healthy, 2 are stale one is dead.)
+    int nodes = 30;
+    int pipelineCountThree = 7;
+    int pipelineCountOne = 21;
+
+    setup(nodes, pipelineCountThree, pipelineCountOne);
+
+    GenericTestUtils.LogCapturer logCapturer =
+        GenericTestUtils.LogCapturer.captureLogs(
+            LoggerFactory.getLogger(SCMChillModeManager.class));
+
+    List<Pipeline> pipelines =
+        pipelineManager.getPipelines(HddsProtos.ReplicationType.RATIS,
+            HddsProtos.ReplicationFactor.ONE);
+    for (int i = 0; i < pipelineCountOne; i++) {
+      firePipelineEvent(pipelines.get(i));
+    }
+
+    GenericTestUtils.waitFor(() -> logCapturer.getOutput().contains(
+        "reported count is 0"), 1000, 5000);
+
+    // fired events for one node ratis pipeline, so we will be still false.
+    Assert.assertFalse(rule.validate());
+
+    pipelines =
+        pipelineManager.getPipelines(HddsProtos.ReplicationType.RATIS,
+            HddsProtos.ReplicationFactor.THREE);
+    for (int i = 0; i < pipelineCountThree - 1; i++) {
+      firePipelineEvent(pipelines.get(i));
+    }
+
+    GenericTestUtils.waitFor(() -> logCapturer.getOutput().contains(
+        "reported count is 6"), 1000, 5000);
+
+    //Fire last pipeline event from datanode.
+    firePipelineEvent(pipelines.get(pipelineCountThree - 1));
+
+    GenericTestUtils.waitFor(() -> rule.validate(), 1000, 5000);
+
+  }
+
+
+
+  private void createPipelines(int count,
+      HddsProtos.ReplicationFactor factor) throws Exception {
+    for (int i = 0; i < count; i++) {
+      pipelineManager.createPipeline(HddsProtos.ReplicationType.RATIS,
+          factor);
+    }
+  }
+
+  private void firePipelineEvent(Pipeline pipeline) {
+    PipelineReportsProto.Builder reportBuilder =
+        PipelineReportsProto.newBuilder();
+
+    reportBuilder.addPipelineReport(PipelineReport.newBuilder()
+        .setPipelineID(pipeline.getId().getProtobuf()));
+
+    if (pipeline.getFactor() == HddsProtos.ReplicationFactor.THREE) {
+      eventQueue.fireEvent(SCMEvents.PROCESSED_PIPELINE_REPORT,
+          new SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode(
+              pipeline.getNodes().get(0), reportBuilder.build()));
+      eventQueue.fireEvent(SCMEvents.PROCESSED_PIPELINE_REPORT,
+          new SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode(
+              pipeline.getNodes().get(1), reportBuilder.build()));
+      eventQueue.fireEvent(SCMEvents.PROCESSED_PIPELINE_REPORT,
+          new SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode(
+              pipeline.getNodes().get(2), reportBuilder.build()));
+    } else {
+      eventQueue.fireEvent(SCMEvents.PROCESSED_PIPELINE_REPORT,
+          new SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode(
+              pipeline.getNodes().get(0), reportBuilder.build()));
+    }
+  }
+}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestSCMChillModeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestSCMChillModeManager.java
index faf8fee8e6b..55dca160b34 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestSCMChillModeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/TestSCMChillModeManager.java
@@ -35,9 +35,10 @@ import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolPro
 import org.apache.hadoop.hdds.scm.HddsTestUtils;
 import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.container.MockNodeManager;
+import org.apache.hadoop.hdds.scm.pipeline.MockRatisPipelineProvider;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
 import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode;
 import org.apache.hadoop.hdds.server.events.EventQueue;
@@ -90,8 +91,7 @@ public class TestSCMChillModeManager {
     }
     scmChillModeManager = new SCMChillModeManager(
         config, containers, null, queue);
-    queue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-        scmChillModeManager);
+
     assertTrue(scmChillModeManager.getInChillMode());
     queue.fireEvent(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
         HddsTestUtils.createNodeRegistrationContainerReport(containers));
@@ -111,8 +111,7 @@ public class TestSCMChillModeManager {
     }
     scmChillModeManager = new SCMChillModeManager(
         config, containers, null, queue);
-    queue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-        scmChillModeManager);
+
     assertTrue(scmChillModeManager.getInChillMode());
 
     testContainerThreshold(containers.subList(0, 25), 0.25);
@@ -167,8 +166,7 @@ public class TestSCMChillModeManager {
 
     scmChillModeManager = new SCMChillModeManager(
         config, containers, null, queue);
-    queue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-        scmChillModeManager);
+
     assertTrue(scmChillModeManager.getInChillMode());
 
     // When 10 CLOSED containers are reported by DNs, the computed container
@@ -192,8 +190,7 @@ public class TestSCMChillModeManager {
     conf.setInt(HddsConfigKeys.HDDS_SCM_CHILLMODE_MIN_DATANODE, numOfDns);
     scmChillModeManager = new SCMChillModeManager(
         conf, containers, null, queue);
-    queue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-        scmChillModeManager);
+
     // Assert SCM is in Chill mode.
     assertTrue(scmChillModeManager.getInChillMode());
 
@@ -243,9 +240,15 @@ public class TestSCMChillModeManager {
       config.setBoolean(
           HddsConfigKeys.HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK, true);
 
-      PipelineManager pipelineManager = new SCMPipelineManager(config,
+      SCMPipelineManager pipelineManager = new SCMPipelineManager(config,
           nodeManager, queue);
 
+      PipelineProvider mockRatisProvider =
+          new MockRatisPipelineProvider(nodeManager,
+              pipelineManager.getStateManager(), config);
+      pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+          mockRatisProvider);
+
       Pipeline pipeline = pipelineManager.createPipeline(
           HddsProtos.ReplicationType.RATIS,
           HddsProtos.ReplicationFactor.THREE);
@@ -256,8 +259,6 @@ public class TestSCMChillModeManager {
 
       scmChillModeManager = new SCMChillModeManager(
           config, containers, pipelineManager, queue);
-      queue.addHandler(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
-          scmChillModeManager);
 
       queue.fireEvent(SCMEvents.NODE_REGISTRATION_CONT_REPORT,
           HddsTestUtils.createNodeRegistrationContainerReport(containers));
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/package-info.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/package-info.java
new file mode 100644
index 00000000000..22a522a11c9
--- /dev/null
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/chillmode/package-info.java
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.hadoop.hdds.scm.chillmode;
+/**
+ * SCM Chill mode tests.
+ */
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestCloseContainerEventHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestCloseContainerEventHandler.java
index fec3f8482a6..f7a5df7aacf 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestCloseContainerEventHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestCloseContainerEventHandler.java
@@ -24,7 +24,8 @@ import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.pipeline.MockRatisPipelineProvider;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
 import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
 import org.apache.hadoop.hdds.server.events.EventQueue;
 import org.apache.hadoop.ozone.container.common.SCMTestUtils;
@@ -49,7 +50,7 @@ public class TestCloseContainerEventHandler {
 
   private static Configuration configuration;
   private static MockNodeManager nodeManager;
-  private static PipelineManager pipelineManager;
+  private static SCMPipelineManager pipelineManager;
   private static SCMContainerManager containerManager;
   private static long size;
   private static File testDir;
@@ -67,6 +68,11 @@ public class TestCloseContainerEventHandler {
     nodeManager = new MockNodeManager(true, 10);
     pipelineManager =
         new SCMPipelineManager(configuration, nodeManager, eventQueue);
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager,
+            pipelineManager.getStateManager(), configuration);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
     containerManager = new
         SCMContainerManager(configuration, nodeManager,
         pipelineManager, new EventQueue());
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerActionsHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerActionsHandler.java
index 0997e1f5bc9..09daa596aa7 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerActionsHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerActionsHandler.java
@@ -59,7 +59,7 @@ public class TestContainerActionsHandler {
             TestUtils.randomDatanodeDetails(), cap);
 
     queue.fireEvent(SCMEvents.CONTAINER_ACTIONS, containerActions);
-
+    queue.processAll(1000L);
     verify(closeContainerEventHandler, times(1))
         .onMessage(ContainerID.valueof(1L), queue);
 
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java
index a4615fc1a7b..9019792f8a5 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationActivityStatus.java
@@ -21,11 +21,20 @@ package org.apache.hadoop.hdds.scm.container.replication;
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeoutException;
+
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.block.BlockManager;
+import org.apache.hadoop.hdds.scm.block.BlockManagerImpl;
+import org.apache.hadoop.hdds.scm.chillmode.ChillModeHandler;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.server.SCMClientProtocolServer;
 import org.apache.hadoop.hdds.server.events.EventQueue;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 /**
  * Tests for ReplicationActivityStatus.
@@ -39,10 +48,19 @@ public class TestReplicationActivityStatus {
   public static void setup() {
     eventQueue = new EventQueue();
     replicationActivityStatus = new ReplicationActivityStatus();
-    eventQueue.addHandler(SCMEvents.START_REPLICATION,
-        replicationActivityStatus.getReplicationStatusListener());
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS,
-        replicationActivityStatus.getChillModeStatusListener());
+
+    OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
+    ozoneConfiguration.set(HddsConfigKeys.
+        HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT, "3s");
+
+    SCMClientProtocolServer scmClientProtocolServer =
+        Mockito.mock(SCMClientProtocolServer.class);
+    BlockManager blockManager = Mockito.mock(BlockManagerImpl.class);
+    ChillModeHandler chillModeHandler =
+        new ChillModeHandler(ozoneConfiguration, scmClientProtocolServer,
+            blockManager, replicationActivityStatus);
+    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler);
+
   }
 
   @Test
@@ -50,11 +68,13 @@ public class TestReplicationActivityStatus {
       throws TimeoutException, InterruptedException {
     assertFalse(replicationActivityStatus.isReplicationEnabled());
     // In chill mode replication process should be stopped.
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, true);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS,
+        new SCMChillModeManager.ChillModeStatus(true));
     assertFalse(replicationActivityStatus.isReplicationEnabled());
 
     // Replication should be enabled when chill mode if off.
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS,
+        new SCMChillModeManager.ChillModeStatus(false));
     GenericTestUtils.waitFor(() -> {
       return replicationActivityStatus.isReplicationEnabled();
     }, 10, 1000*5);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
index 831ee96e4d2..6805210043e 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.protocol.proto
     .StorageContainerDatanodeProtocolProtos.ContainerReplicaProto;
 import org.apache.hadoop.hdds.protocol.proto
@@ -44,6 +45,9 @@ import org.apache.hadoop.hdds.scm.container.ContainerReplica;
 import org.apache.hadoop.hdds.scm.container.ContainerInfo;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
+import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
+import org.apache.hadoop.hdds.scm.pipeline.MockRatisPipelineProvider;
 import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher
     .NodeReportFromDatanode;
 import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
@@ -83,6 +87,13 @@ public class TestDeadNodeHandler {
     eventQueue = new EventQueue();
     scm = HddsTestUtils.getScm(conf);
     nodeManager = (SCMNodeManager) scm.getScmNodeManager();
+    SCMPipelineManager manager =
+        (SCMPipelineManager)scm.getPipelineManager();
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager, manager.getStateManager(),
+            conf);
+    manager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
     containerManager = scm.getContainerManager();
     deadNodeHandler = new DeadNodeHandler(nodeManager, containerManager);
     eventQueue.addHandler(SCMEvents.DEAD_NODE, deadNodeHandler);
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index b81050345f4..1e9e17470c0 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -518,7 +518,7 @@ public class TestSCMNodeManager {
 
       // 3.5 seconds have elapsed for stale node, so it moves into Stale.
       // 7 seconds have elapsed for dead node, so it moves into dead.
-      // 2 Seconds have elapsed for healthy node, so it stays in healhty state.
+      // 2 Seconds have elapsed for healthy node, so it stays in healthy state.
       healthyList = nodeManager.getNodes(HEALTHY);
       List<DatanodeDetails> staleList = nodeManager.getNodes(STALE);
       List<DatanodeDetails> deadList = nodeManager.getNodes(DEAD);
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyInfo.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
similarity index 54%
rename from hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyInfo.java
rename to hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
index 01e55620b95..22828046910 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyInfo.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/MockRatisPipelineProvider.java
@@ -16,34 +16,25 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.ozone.client.rpc.ha;
+package org.apache.hadoop.hdds.scm.pipeline;
 
-import org.apache.hadoop.ozone.om.protocolPB
-    .OzoneManagerProtocolClientSideTranslatorPB;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.scm.node.NodeManager;
 
-import java.net.InetSocketAddress;
+import java.io.IOException;
 
 /**
- * Proxy information of OM.
+ * Mock Ratis Pipeline Provider for Mock Nodes.
  */
-public final class OMProxyInfo {
-  private InetSocketAddress address;
-  private OzoneManagerProtocolClientSideTranslatorPB omClient;
+public class MockRatisPipelineProvider extends RatisPipelineProvider {
 
-  public OMProxyInfo(InetSocketAddress addr) {
-    this.address = addr;
+  public MockRatisPipelineProvider(NodeManager nodeManager,
+                            PipelineStateManager stateManager,
+                            Configuration conf) {
+    super(nodeManager, stateManager, conf);
   }
 
-  public InetSocketAddress getAddress() {
-    return address;
-  }
-
-  public OzoneManagerProtocolClientSideTranslatorPB getOMProxy() {
-    return omClient;
-  }
-
-  public void setOMProxy(
-      OzoneManagerProtocolClientSideTranslatorPB clientProxy) {
-    this.omClient = clientProxy;
+  protected void initializePipeline(Pipeline pipeline) throws IOException {
+    // do nothing as the datanodes do not exists
   }
 }
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
index 4b2001848b1..1846b0c4b8a 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMClientProtocolServer.java
@@ -21,6 +21,10 @@ package org.apache.hadoop.hdds.scm.server;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
+import org.apache.hadoop.hdds.scm.block.BlockManager;
+import org.apache.hadoop.hdds.scm.block.BlockManagerImpl;
+import org.apache.hadoop.hdds.scm.chillmode.ChillModeHandler;
+import org.apache.hadoop.hdds.scm.container.replication.ReplicationActivityStatus;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException;
 import org.apache.hadoop.hdds.server.events.EventQueue;
@@ -28,6 +32,7 @@ import org.apache.hadoop.test.LambdaTestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 /**
  * Test class for @{@link SCMClientProtocolServer}.
@@ -42,7 +47,12 @@ public class TestSCMClientProtocolServer {
     config = new OzoneConfiguration();
     eventQueue = new EventQueue();
     scmClientProtocolServer = new SCMClientProtocolServer(config, null);
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, scmClientProtocolServer);
+    BlockManager blockManager = Mockito.mock(BlockManagerImpl.class);
+    ReplicationActivityStatus replicationActivityStatus =
+        Mockito.mock(ReplicationActivityStatus.class);
+    ChillModeHandler chillModeHandler = new ChillModeHandler(config,
+        scmClientProtocolServer, blockManager, replicationActivityStatus);
+    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, chillModeHandler);
   }
 
   @After
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index f47b88cb5a2..a3e2ad5afca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -1779,6 +1779,7 @@ public class DFSInputStream extends FSInputStream
     case StreamCapabilities.READAHEAD:
     case StreamCapabilities.DROPBEHIND:
     case StreamCapabilities.UNBUFFER:
+    case StreamCapabilities.READBYTEBUFFER:
       return true;
     default:
       return false;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index aaef8ad909a..a4e0742fa9e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -119,7 +119,7 @@ public class DFSOutputStream extends FSOutputSummer
   protected int packetSize = 0; // write packet size, not including the header.
   protected int chunksPerPacket = 0;
   protected long lastFlushOffset = 0; // offset when flush was invoked
-  private long initialFileSize = 0; // at time of file open
+  protected long initialFileSize = 0; // at time of file open
   private final short blockReplication; // replication factor of file
   protected boolean shouldSyncBlock = false; // force blocks to disk upon close
   private final EnumSet<AddBlockFlag> addBlockFlags;
@@ -391,14 +391,16 @@ public class DFSOutputStream extends FSOutputSummer
       EnumSet<CreateFlag> flags, Progressable progress, LocatedBlock lastBlock,
       HdfsFileStatus stat, DataChecksum checksum, String[] favoredNodes)
       throws IOException {
-    if(stat.getErasureCodingPolicy() != null) {
-      throw new IOException(
-          "Not support appending to a striping layout file yet.");
-    }
     try (TraceScope ignored =
              dfsClient.newPathTraceScope("newStreamForAppend", src)) {
-      final DFSOutputStream out = new DFSOutputStream(dfsClient, src, flags,
-          progress, lastBlock, stat, checksum, favoredNodes);
+      DFSOutputStream out;
+      if (stat.isErasureCoded()) {
+        out = new DFSStripedOutputStream(dfsClient, src, flags, progress,
+            lastBlock, stat, checksum, favoredNodes);
+      } else {
+        out = new DFSOutputStream(dfsClient, src, flags, progress, lastBlock,
+            stat, checksum, favoredNodes);
+      }
       out.start();
       return out;
     }
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
index 97310ee8adf..ff81995ad67 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
@@ -276,6 +276,7 @@ public class DFSStripedOutputStream extends DFSOutputStream
   private final int numAllBlocks;
   private final int numDataBlocks;
   private ExtendedBlock currentBlockGroup;
+  private ExtendedBlock prevBlockGroup4Append;
   private final String[] favoredNodes;
   private final List<StripedDataStreamer> failedStreamers;
   private final Map<Integer, Integer> corruptBlockCountMap;
@@ -324,6 +325,16 @@ public class DFSStripedOutputStream extends DFSOutputStream
     setCurrentStreamer(0);
   }
 
+  /** Construct a new output stream for appending to a file. */
+  DFSStripedOutputStream(DFSClient dfsClient, String src,
+      EnumSet<CreateFlag> flags, Progressable progress, LocatedBlock lastBlock,
+      HdfsFileStatus stat, DataChecksum checksum, String[] favoredNodes)
+      throws IOException {
+    this(dfsClient, src, stat, flags, progress, checksum, favoredNodes);
+    initialFileSize = stat.getLen(); // length of file when opened
+    prevBlockGroup4Append = lastBlock != null ? lastBlock.getBlock() : null;
+  }
+
   private boolean useDirectBuffer() {
     return encoder.preferDirectBuffer();
   }
@@ -473,12 +484,17 @@ public class DFSStripedOutputStream extends DFSOutputStream
         + Arrays.asList(excludedNodes));
 
     // replace failed streamers
+    ExtendedBlock prevBlockGroup = currentBlockGroup;
+    if (prevBlockGroup4Append != null) {
+      prevBlockGroup = prevBlockGroup4Append;
+      prevBlockGroup4Append = null;
+    }
     replaceFailedStreamers();
 
     LOG.debug("Allocating new block group. The previous block group: "
-        + currentBlockGroup);
+        + prevBlockGroup);
     final LocatedBlock lb = addBlock(excludedNodes, dfsClient, src,
-        currentBlockGroup, fileId, favoredNodes, getAddBlockFlags());
+         prevBlockGroup, fileId, favoredNodes, getAddBlockFlags());
     assert lb.isStriped();
     // assign the new block to the current block group
     currentBlockGroup = lb.getBlock();
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
index 3cf14cb3bf9..a17c6404024 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
@@ -87,6 +87,15 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
    */
   private boolean observerReadEnabled;
 
+  /**
+   * A client using an ObserverReadProxyProvider should first sync with the
+   * active NameNode on startup. This ensures that the client reads data which
+   * is consistent with the state of the world as of the time of its
+   * instantiation. This variable will be true after this initial sync has
+   * been performed.
+   */
+  private volatile boolean msynced = false;
+
   /**
    * The index into the nameNodeProxies list currently being used. Should only
    * be accessed in synchronized methods.
@@ -224,6 +233,22 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
     return currentProxy;
   }
 
+  /**
+   * This will call {@link ClientProtocol#msync()} on the active NameNode
+   * (via the {@link #failoverProxy}) to initialize the state of this client.
+   * Calling it multiple times is a no-op; only the first will perform an
+   * msync.
+   *
+   * @see #msynced
+   */
+  private synchronized void initializeMsync() throws IOException {
+    if (msynced) {
+      return; // No need for an msync
+    }
+    failoverProxy.getProxy().proxy.msync();
+    msynced = true;
+  }
+
   /**
    * An InvocationHandler to handle incoming requests. This class's invoke
    * method contains the primary logic for redirecting to observers.
@@ -244,6 +269,12 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
       Object retVal;
 
       if (observerReadEnabled && isRead(method)) {
+        if (!msynced) {
+          // An msync() must first be performed to ensure that this client is
+          // up-to-date with the active's state. This will only be done once.
+          initializeMsync();
+        }
+
         int failedObserverCount = 0;
         int activeCount = 0;
         int standbyCount = 0;
@@ -315,6 +346,9 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
         // This exception will be handled by higher layers
         throw e.getCause();
       }
+      // If this was reached, the request reached the active, so the
+      // state is up-to-date with active and no further msync is needed.
+      msynced = true;
       lastProxy = activeProxy;
       return retVal;
     }
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
index d54341b1715..0482071fcfd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
@@ -243,6 +243,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
                     <exec executable="ctest" failonerror="true" dir="${project.build.directory}/">
                       <arg line="--output-on-failure"/>
                       <arg line="${native_ctest_args}"/>
+                      <env key="LIBHDFS_OPTS" value="${env.LIBHDFS_OPTS} -Xcheck:jni"/>
                       <env key="CLASSPATH" value="${test_classpath}:${compile_classpath}"/>
                       <!-- Make sure libhadoop.so is on LD_LIBRARY_PATH. -->
                       <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib"/>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c
index 9c2ee8c52b0..41caffd290c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c
@@ -1013,7 +1013,7 @@ static hdfsFile hdfsOpenFileImpl(hdfsFS fs, const char *path, int flags,
        return f{is|os};
     */
     int accmode = flags & O_ACCMODE;
-    jstring jStrBufferSize = NULL, jStrReplication = NULL;
+    jstring jStrBufferSize = NULL, jStrReplication = NULL, jCapabilityString = NULL;
     jobject jConfiguration = NULL, jPath = NULL, jFile = NULL;
     jobject jFS = (jobject)fs;
     jthrowable jthr;
@@ -1171,16 +1171,22 @@ static hdfsFile hdfsOpenFileImpl(hdfsFS fs, const char *path, int flags,
     file->flags = 0;
 
     if ((flags & O_WRONLY) == 0) {
-        // Try a test read to see if we can do direct reads
-        char buf;
-        if (readDirect(fs, file, &buf, 0) == 0) {
-            // Success - 0-byte read should return 0
+        // Check the StreamCapabilities of jFile to see if we can do direct reads
+        jthr = newJavaStr(env, "in:readbytebuffer", &jCapabilityString);
+        if (jthr) {
+            ret = printExceptionAndFree(env, jthr, PRINT_EXC_ALL,
+                                        "hdfsOpenFile(%s): newJavaStr", path);
+            goto done;
+        }
+        jthr = invokeMethod(env, &jVal, INSTANCE, jFile, HADOOP_ISTRM,
+                            "hasCapability", "(Ljava/lang/String;)Z", jCapabilityString);
+        if (jthr) {
+            ret = printExceptionAndFree(env, jthr, PRINT_EXC_ALL,
+                                        "hdfsOpenFile(%s): FSDataInputStream#hasCapability", path);
+            goto done;
+        }
+        if (jVal.z) {
             file->flags |= HDFS_FILE_SUPPORTS_DIRECT_READ;
-        } else if (errno != ENOTSUP) {
-            // Unexpected error. Clear it, don't set the direct flag.
-            fprintf(stderr,
-                  "hdfsOpenFile(%s): WARN: Unexpected error %d when testing "
-                  "for direct read compatibility\n", path, errno);
         }
     }
     ret = 0;
@@ -1190,7 +1196,8 @@ done:
     destroyLocalReference(env, jStrReplication);
     destroyLocalReference(env, jConfiguration); 
     destroyLocalReference(env, jPath); 
-    destroyLocalReference(env, jFile); 
+    destroyLocalReference(env, jFile);
+    destroyLocalReference(env, jCapabilityString);
     if (ret) {
         if (file) {
             if (file->file) {
@@ -2508,7 +2515,7 @@ int hadoopRzOptionsSetByteBufferPool(
         // Delete any previous ByteBufferPool we had.
         (*env)->DeleteGlobalRef(env, opts->byteBufferPool);
     }
-    opts->byteBufferPool = byteBufferPool;
+    opts->byteBufferPool = (*env)->NewGlobalRef(env, byteBufferPool);
     return 0;
 }
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfs_ext_test.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfs_ext_test.cc
index 19d95b47e69..79771f0d7c5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfs_ext_test.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfs_ext_test.cc
@@ -503,7 +503,10 @@ TEST_F(HdfsExtTest, TestReadStats) {
   hdfsFileFreeReadStatistics(stats);
 
   EXPECT_EQ(0, hdfsCloseFile(fs, file));
-  EXPECT_EQ(0, errno);
+  // Since libhdfs is not guaranteed to set errno to 0 on successful
+  // operations, we disable this check for now, see HDFS-14325 for a
+  // long term solution to this problem
+  // EXPECT_EQ(0, errno);
 }
 
 //Testing working directory
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
index 0ca5f737dd4..73765cf0df0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
@@ -335,6 +335,11 @@ public class NamenodeBeanMetrics
     return "N/A";
   }
 
+  @Override
+  public int getCorruptFilesCount() {
+    return 0;
+  }
+
   @Override
   public int getThreads() {
     return ManagementFactory.getThreadMXBean().getThreadCount();
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index fedfc5a7dce..b3cd0a4f857 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -331,7 +331,8 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final int     DFS_NAMENODE_QUOTA_INIT_THREADS_DEFAULT = 4;
 
   public static final String  DFS_NAMENODE_EDIT_LOG_AUTOROLL_MULTIPLIER_THRESHOLD = "dfs.namenode.edit.log.autoroll.multiplier.threshold";
-  public static final float   DFS_NAMENODE_EDIT_LOG_AUTOROLL_MULTIPLIER_THRESHOLD_DEFAULT = 2.0f;
+  public static final float
+      DFS_NAMENODE_EDIT_LOG_AUTOROLL_MULTIPLIER_THRESHOLD_DEFAULT = 0.5f;
   public static final String  DFS_NAMENODE_EDIT_LOG_AUTOROLL_CHECK_INTERVAL_MS = "dfs.namenode.edit.log.autoroll.check.interval.ms";
   public static final int     DFS_NAMENODE_EDIT_LOG_AUTOROLL_CHECK_INTERVAL_MS_DEFAULT = 5*60*1000;
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 8a3f57b4b3a..049c949e8a4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1134,7 +1134,6 @@ public class DatanodeManager {
           nodeDescr.setDependentHostNames(
               getNetworkDependenciesWithDefault(nodeDescr));
         }
-        networktopology.add(nodeDescr);
         nodeDescr.setSoftwareVersion(nodeReg.getSoftwareVersion());
         resolveUpgradeDomain(nodeDescr);
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
index f22a5862fc9..b0a721f9700 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
@@ -107,6 +107,7 @@ class BPServiceActor implements Runnable {
   private final DataNode dn;
   private final DNConf dnConf;
   private long prevBlockReportId;
+  private long fullBlockReportLeaseId;
   private final SortedSet<Integer> blockReportSizes =
       Collections.synchronizedSortedSet(new TreeSet<>());
   private final int maxDataLength;
@@ -131,6 +132,7 @@ class BPServiceActor implements Runnable {
         dnConf.ibrInterval,
         dn.getMetrics());
     prevBlockReportId = ThreadLocalRandom.current().nextLong();
+    fullBlockReportLeaseId = 0;
     scheduler = new Scheduler(dnConf.heartBeatInterval,
         dnConf.getLifelineIntervalMs(), dnConf.blockReportInterval,
         dnConf.outliersReportIntervalMs);
@@ -638,7 +640,6 @@ class BPServiceActor implements Runnable {
         + "; heartBeatInterval=" + dnConf.heartBeatInterval
         + (lifelineSender != null ?
             "; lifelineIntervalMs=" + dnConf.getLifelineIntervalMs() : ""));
-    long fullBlockReportLeaseId = 0;
 
     //
     // Now loop for a long time....
@@ -806,6 +807,10 @@ class BPServiceActor implements Runnable {
     LOG.info("Block pool " + this + " successfully registered with NN");
     bpos.registrationSucceeded(this, bpRegistration);
 
+    // reset lease id whenever registered to NN.
+    // ask for a new lease id at the next heartbeat.
+    fullBlockReportLeaseId = 0;
+
     // random short delay - helps scatter the BR from all DNs
     scheduler.scheduleBlockReport(dnConf.initialBlockReportDelayMs);
   }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAppendOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAppendOp.java
index be272d2b220..6b9fd8bfb0d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAppendOp.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAppendOp.java
@@ -107,12 +107,6 @@ final class FSDirAppendOp {
       }
       final INodeFile file = INodeFile.valueOf(inode, path, true);
 
-      // not support appending file with striped blocks
-      if (file.isStriped()) {
-        throw new UnsupportedOperationException(
-            "Cannot append to files with striped block " + path);
-      }
-
       BlockManager blockManager = fsd.getBlockManager();
       final BlockStoragePolicy lpPolicy = blockManager
           .getStoragePolicy("LAZY_PERSIST");
@@ -192,6 +186,10 @@ final class FSDirAppendOp {
 
     LocatedBlock ret = null;
     if (!newBlock) {
+      if (file.isStriped()) {
+        throw new UnsupportedOperationException(
+            "Append on EC file without new block is not supported.");
+      }
       FSDirectory fsd = fsn.getFSDirectory();
       ret = fsd.getBlockManager().convertLastBlockToUnderConstruction(file, 0);
       if (ret != null && delta != null) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
index cc1dcba8e3b..5b348e59211 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
@@ -563,7 +563,8 @@ public class FSEditLog implements LogsPurgeable {
   /**
    * @return the first transaction ID in the current log segment
    */
-  synchronized long getCurSegmentTxId() {
+  @VisibleForTesting
+  public synchronized long getCurSegmentTxId() {
     Preconditions.checkState(isSegmentOpen(),
         "Bad state: %s", state);
     return curSegmentTxId;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index d0fdbac8228..ba806d2b527 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -6350,6 +6350,15 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
 
   @Override  // NameNodeMXBean
   public String getCorruptFiles() {
+    return JSON.toString(getCorruptFilesList());
+  }
+
+  @Override // NameNodeMXBean
+  public int getCorruptFilesCount() {
+    return getCorruptFilesList().size();
+  }
+
+  private List<String> getCorruptFilesList() {
     List<String> list = new ArrayList<String>();
     Collection<FSNamesystem.CorruptFileBlockInfo> corruptFileBlocks;
     try {
@@ -6367,7 +6376,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
     } catch (IOException e) {
       LOG.warn("Get corrupt file blocks returned error", e);
     }
-    return JSON.toString(list);
+    return list;
   }
 
   @Override  // NameNodeMXBean
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
index 8bf0bcbea6c..69fa01023a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java
@@ -35,58 +35,58 @@ public interface NameNodeMXBean {
   /**
    * Gets the version of Hadoop.
    * 
-   * @return the version
+   * @return the version.
    */
-  public String getVersion();
+  String getVersion();
 
   /**
-   * Get the version of software running on the Namenode
-   * @return a string representing the version
+   * Get the version of software running on the Namenode.
+   *
+   * @return a string representing the version.
    */
-  public String getSoftwareVersion();
+  String getSoftwareVersion();
 
   /**
    * Gets the used space by data nodes.
    * 
-   * @return the used space by data nodes
+   * @return the used space by data nodes.
    */
-  public long getUsed();
+  long getUsed();
   
   /**
    * Gets total non-used raw bytes.
    * 
-   * @return total non-used raw bytes
+   * @return total non-used raw bytes.
    */
-  public long getFree();
+  long getFree();
   
   /**
    * Gets total raw bytes including non-dfs used space.
    * 
-   * @return the total raw bytes including non-dfs used space
+   * @return the total raw bytes including non-dfs used space.
    */
-  public long getTotal();
+  long getTotal();
 
   /**
    * Gets capacity of the provided storage mounted, in bytes.
    *
    * @return the total raw bytes present in the provided storage.
    */
-  public long getProvidedCapacity();
+  long getProvidedCapacity();
 
   /**
-   * Gets the safemode status
-   * 
-   * @return the safemode status
+   * Gets the safemode status.
    * 
+   * @return the safemode status.
    */
-  public String getSafemode();
+  String getSafemode();
   
   /**
    * Checks if upgrade is finalized.
    * 
-   * @return true, if upgrade is finalized
+   * @return true, if upgrade is finalized.
    */
-  public boolean isUpgradeFinalized();
+  boolean isUpgradeFinalized();
 
   /**
    * Gets the RollingUpgrade information.
@@ -94,73 +94,82 @@ public interface NameNodeMXBean {
    * @return Rolling upgrade information if an upgrade is in progress. Else
    * (e.g. if there is no upgrade or the upgrade is finalized), returns null.
    */
-  public RollingUpgradeInfo.Bean getRollingUpgradeStatus();
+  RollingUpgradeInfo.Bean getRollingUpgradeStatus();
 
   /**
    * Gets total used space by data nodes for non DFS purposes such as storing
-   * temporary files on the local file system
+   * temporary files on the local file system.
    * 
-   * @return the non dfs space of the cluster
+   * @return the non dfs space of the cluster.
    */
-  public long getNonDfsUsedSpace();
+  long getNonDfsUsedSpace();
   
   /**
-   * Gets the total used space by data nodes as percentage of total capacity
+   * Gets the total used space by data nodes as percentage of total capacity.
    * 
    * @return the percentage of used space on the cluster.
    */
-  public float getPercentUsed();
+  float getPercentUsed();
   
   /**
    * Gets the total remaining space by data nodes as percentage of total 
-   * capacity
+   * capacity.
    * 
-   * @return the percentage of the remaining space on the cluster
+   * @return the percentage of the remaining space on the cluster.
    */
-  public float getPercentRemaining();
+  float getPercentRemaining();
 
   /**
-   * Returns the amount of cache used by the datanode (in bytes).
+   * Gets the amount of cache used by the datanode (in bytes).
+   *
+   * @return the amount of cache used by the datanode (in bytes).
    */
-  public long getCacheUsed();
+  long getCacheUsed();
 
   /**
-   * Returns the total cache capacity of the datanode (in bytes).
+   * Gets the total cache capacity of the datanode (in bytes).
+   *
+   * @return the total cache capacity of the datanode (in bytes).
    */
-  public long getCacheCapacity();
+  long getCacheCapacity();
   
   /**
-   * Get the total space used by the block pools of this namenode
+   * Get the total space used by the block pools of this namenode.
+   *
+   * @return the total space used by the block pools of this namenode.
    */
-  public long getBlockPoolUsedSpace();
+  long getBlockPoolUsedSpace();
   
   /**
-   * Get the total space used by the block pool as percentage of total capacity
+   * Get the total space used by the block pool as percentage of total capacity.
+   *
+   * @return the total space used by the block pool as percentage of total
+   * capacity.
    */
-  public float getPercentBlockPoolUsed();
+  float getPercentBlockPoolUsed();
     
   /**
    * Gets the total numbers of blocks on the cluster.
    * 
-   * @return the total number of blocks of the cluster
+   * @return the total number of blocks of the cluster.
    */
-  public long getTotalBlocks();
+  long getTotalBlocks();
   
   /**
-   * Gets the total number of missing blocks on the cluster
+   * Gets the total number of missing blocks on the cluster.
    * 
-   * @return the total number of missing blocks on the cluster
+   * @return the total number of missing blocks on the cluster.
    */
-  public long getNumberOfMissingBlocks();
+  long getNumberOfMissingBlocks();
   
   /**
    * Gets the total number of missing blocks on the cluster with
-   * replication factor 1
+   * replication factor 1.
    *
    * @return the total number of missing blocks on the cluster with
-   * replication factor 1
+   * replication factor 1.
    */
-  public long getNumberOfMissingBlocksWithReplicationFactorOne();
+  long getNumberOfMissingBlocksWithReplicationFactorOne();
 
   /**
    * Gets the total number of replicated low redundancy blocks on the cluster
@@ -169,72 +178,72 @@ public interface NameNodeMXBean {
    * @return the total number of low redundancy blocks on the cluster
    * with the highest risk of loss.
    */
-  public long getHighestPriorityLowRedundancyReplicatedBlocks();
+  long getHighestPriorityLowRedundancyReplicatedBlocks();
 
   /**
    * Gets the total number of erasure coded low redundancy blocks on the cluster
-   * with the highest risk of loss
+   * with the highest risk of loss.
    *
    * @return the total number of low redundancy blocks on the cluster
-   * with the highest risk of loss
+   * with the highest risk of loss.
    */
-  public long getHighestPriorityLowRedundancyECBlocks();
+  long getHighestPriorityLowRedundancyECBlocks();
 
   /**
    * Gets the total number of snapshottable dirs in the system.
    *
-   * @return the total number of snapshottable dirs in the system
+   * @return the total number of snapshottable dirs in the system.
    */
-  public long getNumberOfSnapshottableDirs();
+  long getNumberOfSnapshottableDirs();
 
   /**
    * Gets the number of threads.
    * 
-   * @return the number of threads
+   * @return the number of threads.
    */
-  public int getThreads();
+  int getThreads();
 
   /**
    * Gets the live node information of the cluster.
    * 
-   * @return the live node information
+   * @return the live node information.
    */
-  public String getLiveNodes();
+  String getLiveNodes();
   
   /**
    * Gets the dead node information of the cluster.
    * 
-   * @return the dead node information
+   * @return the dead node information.
    */
-  public String getDeadNodes();
+  String getDeadNodes();
   
   /**
    * Gets the decommissioning node information of the cluster.
    * 
-   * @return the decommissioning node information
+   * @return the decommissioning node information.
    */
-  public String getDecomNodes();
+  String getDecomNodes();
 
   /**
    * Gets the information on nodes entering maintenance.
    *
-   * @return the information on nodes entering maintenance
+   * @return the information on nodes entering maintenance.
    */
   String getEnteringMaintenanceNodes();
 
   /**
    * Gets the cluster id.
    * 
-   * @return the cluster id
+   * @return the cluster id.
    */
-  public String getClusterId();
+  String getClusterId();
   
   /**
    * Gets the block pool id.
    * 
-   * @return the block pool id
+   * @return the block pool id.
    */
-  public String getBlockPoolId();
+  String getBlockPoolId();
 
   /**
    * Get status information about the directories storing image and edits logs
@@ -242,71 +251,83 @@ public interface NameNodeMXBean {
    * 
    * @return the name dir status information, as a JSON string.
    */
-  public String getNameDirStatuses();
+  String getNameDirStatuses();
 
   /**
    * Get Max, Median, Min and Standard Deviation of DataNodes usage.
    *
    * @return the DataNode usage information, as a JSON string.
    */
-  public String getNodeUsage();
+  String getNodeUsage();
 
   /**
    * Get status information about the journals of the NN.
    *
    * @return the name journal status information, as a JSON string.
    */
-  public String getNameJournalStatus();
+  String getNameJournalStatus();
   
   /**
    * Get information about the transaction ID, including the last applied 
-   * transaction ID and the most recent checkpoint's transaction ID
+   * transaction ID and the most recent checkpoint's transaction ID.
+   *
+   * @return information about the transaction ID.
    */
-  public String getJournalTransactionInfo();
+  String getJournalTransactionInfo();
 
   /**
    * Gets the NN start time in milliseconds.
-   * @return the NN start time in msec
+   *
+   * @return the NN start time in msec.
    */
   long getNNStartedTimeInMillis();
 
   /**
-   * Get the compilation information which contains date, user and branch
+   * Get the compilation information which contains date, user and branch.
    *
    * @return the compilation information, as a JSON string.
    */
-  public String getCompileInfo();
+  String getCompileInfo();
 
   /**
-   * Get the list of corrupt files
+   * Get the list of corrupt files.
    *
    * @return the list of corrupt files, as a JSON string.
    */
-  public String getCorruptFiles();
+  String getCorruptFiles();
 
   /**
-   * Get the number of distinct versions of live datanodes
-   * 
-   * @return the number of distinct versions of live datanodes
+   * Get the length of the list of corrupt files.
+   *
+   * @return the length of the list of corrupt files.
    */
-  public int getDistinctVersionCount();
+  int getCorruptFilesCount();
 
   /**
-   * Get the number of live datanodes for each distinct versions
+   * Get the number of distinct versions of live datanodes.
    * 
-   * @return the number of live datanodes for each distinct versions
+   * @return the number of distinct versions of live datanodes.
    */
-  public Map<String, Integer> getDistinctVersions();
+  int getDistinctVersionCount();
+
+  /**
+   * Get the number of live datanodes for each distinct versions.
+   * 
+   * @return the number of live datanodes for each distinct versions.
+   */
+  Map<String, Integer> getDistinctVersions();
   
   /**
    * Get namenode directory size.
+   *
+   * @return namenode directory size.
    */
   String getNameDirSize();
 
   /**
    * Verifies whether the cluster setup can support all enabled EC policies.
    *
-   * @return the result of the verification
+   * @return the result of the verification.
    */
   String getVerifyECWithTopologyResult();
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index f50648d9b66..525d9c85a0f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -1409,7 +1409,8 @@ public class NameNodeRpcServer implements NamenodeProtocols {
 
   @Override // ClientProtocol
   public void msync() throws IOException {
-    // TODO : need to be filled up if needed. May be a no-op here.
+    // Check for write access to ensure that msync only happens on active
+    namesystem.checkOperation(OperationCategory.WRITE);
   }
 
   @Override // ClientProtocol
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java
index f4903931d54..0ab8ef19902 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java
@@ -110,6 +110,11 @@ public class EditLogTailer {
    */
   private long lastLoadTimeMs;
 
+  /**
+   * The last time we triggered a edit log roll on active namenode.
+   */
+  private long lastRollTimeMs;
+
   /**
    * How often the Standby should roll edit logs. Since the Standby only reads
    * from finalized log segments, the Standby will only be as up-to-date as how
@@ -140,7 +145,8 @@ public class EditLogTailer {
   private int nnLoopCount = 0;
 
   /**
-   * maximum number of retries we should give each of the remote namenodes before giving up
+   * Maximum number of retries we should give each of the remote namenodes
+   * before giving up.
    */
   private int maxRetries;
 
@@ -166,6 +172,7 @@ public class EditLogTailer {
     this.editLog = namesystem.getEditLog();
     
     lastLoadTimeMs = monotonicNow();
+    lastRollTimeMs = monotonicNow();
 
     logRollPeriodMs = conf.getTimeDuration(
         DFSConfigKeys.DFS_HA_LOGROLL_PERIOD_KEY,
@@ -354,7 +361,7 @@ public class EditLogTailer {
    */
   private boolean tooLongSinceLastLoad() {
     return logRollPeriodMs >= 0 && 
-      (monotonicNow() - lastLoadTimeMs) > logRollPeriodMs ;
+      (monotonicNow() - lastRollTimeMs) > logRollPeriodMs;
   }
 
   /**
@@ -382,6 +389,7 @@ public class EditLogTailer {
     try {
       future = rollEditsRpcExecutor.submit(getNameNodeProxy());
       future.get(rollEditsTimeoutMs, TimeUnit.MILLISECONDS);
+      lastRollTimeMs = monotonicNow();
       lastRollTriggerTxId = lastLoadedTxnId;
     } catch (ExecutionException e) {
       LOG.warn("Unable to trigger a roll of the active NN", e);
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index 94d6512525d..e9b35be5012 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -2614,7 +2614,7 @@
 
 <property>
   <name>dfs.namenode.edit.log.autoroll.multiplier.threshold</name>
-  <value>2.0</value>
+  <value>0.5</value>
   <description>
     Determines when an active namenode will roll its own edit log.
     The actual threshold (in number of edits) is determined by multiplying
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
index 5b2838ca9b5..4e8b362d9ae 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js
@@ -303,10 +303,13 @@
           .attr("class", "bar")
           .attr("transform", function(d) { return "translate(" + x(d.x0) + "," + y(d.length) + ")"; });
 
+      window.liveNodes = dnData.LiveNodes;
+
       bar.append("rect")
           .attr("x", 1)
           .attr("width", x(bins[0].x1) - x(bins[0].x0) - 1)
-          .attr("height", function(d) { return height - y(d.length); });
+          .attr("height", function(d) { return height - y(d.length); })
+          .attr("onclick", function (d) { return "open_hostip_list(" + d.x0 + "," + d.x1 + ")"; });
 
       bar.append("text")
           .attr("dy", ".75em")
@@ -425,3 +428,45 @@
     load_page();
   });
 })();
+
+function open_hostip_list(x0, x1) {
+  close_hostip_list();
+  var ips = new Array();
+  for (var i = 0; i < liveNodes.length; i++) {
+    var dn = liveNodes[i];
+    var index = (dn.usedSpace / dn.capacity) * 100.0;
+    if (index == 0) {
+      index = 1;
+    }
+    //More than 100% do not care,so not record in 95%-100% bar
+    if (index > x0 && index <= x1) {
+      ips.push(dn.infoAddr.split(":")[0]);
+    }
+  }
+  var ipsText = '';
+  for (var i = 0; i < ips.length; i++) {
+    ipsText += ips[i] + '\n';
+  }
+  var histogram_div = document.getElementById('datanode-usage-histogram');
+  histogram_div.setAttribute('style', 'position: relative');
+  var ips_div = document.createElement("textarea");
+  ips_div.setAttribute('id', 'datanode_ips');
+  ips_div.setAttribute('rows', '8');
+  ips_div.setAttribute('cols', '14');
+  ips_div.setAttribute('style', 'position: absolute;top: 0px;right: -38px;');
+  ips_div.setAttribute('readonly', 'readonly');
+  histogram_div.appendChild(ips_div);
+
+  var close_div = document.createElement("div");
+  histogram_div.appendChild(close_div);
+  close_div.setAttribute('id', 'close_ips');
+  close_div.setAttribute('style', 'position: absolute;top: 0px;right: -62px;width:20px;height;20px');
+  close_div.setAttribute('onclick', 'close_hostip_list()');
+  close_div.innerHTML = "X";
+  ips_div.innerHTML = ipsText;
+}
+
+function close_hostip_list() {
+  $("#datanode_ips").remove();
+  $("#close_ips").remove();
+}
\ No newline at end of file
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
index ff2f7ce153f..da90d1b9ed7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
@@ -88,6 +88,7 @@
 
 <script type="text/javascript" src="/static/jquery-3.3.1.min.js">
 </script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js">
+</script><script type="text/javascript" src="/static/moment.min.js">
 </script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">
 </script><script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js">
 </script><script type="text/javascript" src="/static/dfs-dust.js">
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStripedFileAppend.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStripedFileAppend.java
new file mode 100644
index 00000000000..b4cf102c7c0
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStripedFileAppend.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.fs.CreateFlag;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
+import org.apache.log4j.Level;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests append on erasure coded file.
+ */
+public class TestStripedFileAppend {
+  public static final Log LOG = LogFactory.getLog(TestStripedFileAppend.class);
+
+  static {
+    DFSTestUtil.setNameNodeLogLevel(Level.ALL);
+  }
+
+  private static final int NUM_DATA_BLOCKS =
+      StripedFileTestUtil.getDefaultECPolicy().getNumDataUnits();
+  private static final int CELL_SIZE =
+      StripedFileTestUtil.getDefaultECPolicy().getCellSize();
+  private static final int NUM_DN = 9;
+  private static final int STRIPES_PER_BLOCK = 4;
+  private static final int BLOCK_SIZE = CELL_SIZE * STRIPES_PER_BLOCK;
+  private static final int BLOCK_GROUP_SIZE = BLOCK_SIZE * NUM_DATA_BLOCKS;
+  private static final Random RANDOM = new Random();
+
+  private MiniDFSCluster cluster;
+  private DistributedFileSystem dfs;
+  private Path dir = new Path("/TestFileAppendStriped");
+  private HdfsConfiguration conf = new HdfsConfiguration();
+
+  @Before
+  public void setup() throws IOException {
+    conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, BLOCK_SIZE);
+    cluster = new MiniDFSCluster.Builder(conf).numDataNodes(NUM_DN).build();
+    cluster.waitActive();
+    dfs = cluster.getFileSystem();
+    dfs.mkdirs(dir);
+    dfs.setErasureCodingPolicy(dir, null);
+  }
+
+  @After
+  public void tearDown() throws IOException {
+    if (cluster != null) {
+      cluster.shutdown();
+    }
+  }
+
+  /**
+   * test simple append to a closed striped file, with NEW_BLOCK flag enabled.
+   */
+  @Test
+  public void testAppendToNewBlock() throws IOException {
+    int fileLength = 0;
+    int totalSplit = 6;
+    byte[] expected =
+        StripedFileTestUtil.generateBytes(BLOCK_GROUP_SIZE * totalSplit);
+
+    Path file = new Path(dir, "testAppendToNewBlock");
+    FSDataOutputStream out;
+    for (int split = 0; split < totalSplit; split++) {
+      if (split == 0) {
+        out = dfs.create(file);
+      } else {
+        out = dfs.append(file,
+            EnumSet.of(CreateFlag.APPEND, CreateFlag.NEW_BLOCK), 4096, null);
+      }
+      int splitLength = RANDOM.nextInt(BLOCK_GROUP_SIZE);
+      out.write(expected, fileLength, splitLength);
+      fileLength += splitLength;
+      out.close();
+    }
+    expected = Arrays.copyOf(expected, fileLength);
+    LocatedBlocks lbs =
+        dfs.getClient().getLocatedBlocks(file.toString(), 0L, Long.MAX_VALUE);
+    assertEquals(totalSplit, lbs.getLocatedBlocks().size());
+    StripedFileTestUtil.verifyStatefulRead(dfs, file, fileLength, expected,
+        new byte[4096]);
+    StripedFileTestUtil.verifySeek(dfs, file, fileLength,
+        StripedFileTestUtil.getDefaultECPolicy(), totalSplit);
+  }
+
+}
\ No newline at end of file
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeSync.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeSync.java
index 2f145e8b04b..c23604b9988 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeSync.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeSync.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.hdfs.qjournal.server;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Lists;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
@@ -30,25 +29,16 @@ import org.apache.hadoop.hdfs.protocol.HdfsConstants;
 import org.apache.hadoop.hdfs.protocol.RollingUpgradeInfo;
 import org.apache.hadoop.hdfs.qjournal.MiniJournalCluster;
 import org.apache.hadoop.hdfs.qjournal.MiniQJMHACluster;
-import org.apache.hadoop.hdfs.qjournal.TestSecureNNWithQJM;
 import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
 import org.apache.hadoop.hdfs.server.namenode.FileJournalManager.EditLogFile;
-import static org.apache.hadoop.hdfs.DFSConfigKeys.*;
 import static org.apache.hadoop.hdfs.server.namenode.FileJournalManager
     .getLogFile;
 import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-import org.apache.hadoop.http.HttpConfig;
-import org.apache.hadoop.minikdc.MiniKdc;
-import org.apache.hadoop.security.SecurityUtil;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -56,7 +46,6 @@ import org.junit.rules.TestName;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.Properties;
 import java.util.Random;
 
 /**
@@ -73,85 +62,12 @@ public class TestJournalNodeSync {
   private int activeNNindex=0;
   private static final int DFS_HA_TAILEDITS_PERIOD_SECONDS=1;
 
-  private static HdfsConfiguration baseConf;
-  private static File baseDir;
-  private static String keystoresDir;
-  private static String sslConfDir;
-  private static MiniKdc kdc;
-
   @Rule
   public TestName testName = new TestName();
 
-  @BeforeClass
-  public static void init() throws Exception {
-    // Init Kerberos
-    baseDir =
-        GenericTestUtils.getTestDir(TestSecureNNWithQJM.class.getSimpleName());
-    FileUtil.fullyDelete(baseDir);
-    Assert.assertTrue(baseDir.mkdirs());
-
-    Properties kdcConf = MiniKdc.createConf();
-    kdc = new MiniKdc(kdcConf, baseDir);
-    kdc.start();
-
-    baseConf = new HdfsConfiguration();
-    SecurityUtil.setAuthenticationMethod(
-        UserGroupInformation.AuthenticationMethod.KERBEROS, baseConf);
-    UserGroupInformation.setConfiguration(baseConf);
-    Assert.assertTrue("Expected configuration to enable security",
-        UserGroupInformation.isSecurityEnabled());
-
-    String userName = UserGroupInformation.getLoginUser().getShortUserName();
-    File keytabFile = new File(baseDir, userName + ".keytab");
-    String keytab = keytabFile.getAbsolutePath();
-    // Windows will not reverse name lookup "127.0.0.1" to "localhost".
-    String krbInstance = Path.WINDOWS ? "127.0.0.1" : "localhost";
-    kdc.createPrincipal(keytabFile,
-        userName + "/" + krbInstance,
-        "HTTP/" + krbInstance);
-    String hdfsPrincipal = userName + "/" + krbInstance + "@" + kdc.getRealm();
-    String spnegoPrincipal = "HTTP/" + krbInstance + "@" + kdc.getRealm();
-
-    baseConf.set(DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY, hdfsPrincipal);
-    baseConf.set(DFS_NAMENODE_KEYTAB_FILE_KEY, keytab);
-    baseConf.set(DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, hdfsPrincipal);
-    baseConf.set(DFS_DATANODE_KEYTAB_FILE_KEY, keytab);
-    baseConf.set(DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY,
-        spnegoPrincipal);
-    baseConf.set(DFS_JOURNALNODE_KEYTAB_FILE_KEY, keytab);
-    baseConf.set(DFS_JOURNALNODE_KERBEROS_PRINCIPAL_KEY, hdfsPrincipal);
-    baseConf.set(DFS_JOURNALNODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY,
-        spnegoPrincipal);
-    baseConf.setBoolean(DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, true);
-    baseConf.set(DFS_DATA_TRANSFER_PROTECTION_KEY, "authentication");
-    baseConf.set(DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTPS_ONLY.name());
-    baseConf.set(DFS_NAMENODE_HTTPS_ADDRESS_KEY, "localhost:0");
-    baseConf.set(DFS_DATANODE_HTTPS_ADDRESS_KEY, "localhost:0");
-    baseConf.set(DFS_JOURNALNODE_HTTPS_ADDRESS_KEY, "localhost:0");
-    baseConf.setInt(IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SASL_KEY, 10);
-
-    keystoresDir = baseDir.getAbsolutePath();
-    sslConfDir = KeyStoreTestUtil.getClasspathDir(
-        TestSecureNNWithQJM.class);
-    KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, baseConf, false);
-    baseConf.set(DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY,
-        KeyStoreTestUtil.getClientSSLConfigFileName());
-    baseConf.set(DFS_SERVER_HTTPS_KEYSTORE_RESOURCE_KEY,
-        KeyStoreTestUtil.getServerSSLConfigFileName());
-  }
-
-  @AfterClass
-  public static void destroy() throws Exception {
-    if (kdc != null) {
-      kdc.stop();
-    }
-    FileUtil.fullyDelete(baseDir);
-    KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir);
-  }
-
   @Before
-  public void setUpMiniCluster() throws Exception {
-    conf = new HdfsConfiguration(baseConf);
+  public void setUpMiniCluster() throws IOException {
+    conf = new HdfsConfiguration();
     conf.setBoolean(DFSConfigKeys.DFS_JOURNALNODE_ENABLE_SYNC_KEY, true);
     conf.setLong(DFSConfigKeys.DFS_JOURNALNODE_SYNC_INTERVAL_KEY, 1000L);
     if (testName.getMethodName().equals(
@@ -602,8 +518,6 @@ public class TestJournalNodeSync {
    * @return the startTxId of next segment after rolling edits.
    */
   private long generateEditLog(int numEdits) throws IOException {
-    // rollEditLog first due to OP_UPDATE_MASTER_KEY
-    dfsCluster.getNameNode(activeNNindex).getRpcServer().rollEditLog();
     long lastWrittenTxId = dfsCluster.getNameNode(activeNNindex).getFSImage()
         .getEditLog().getLastWrittenTxId();
     for (int i = 1; i <= numEdits; i++) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
index 87bbd738dd8..d34654edf97 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
@@ -27,12 +27,12 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -61,6 +61,8 @@ import org.apache.hadoop.hdfs.server.protocol.SlowPeerReports;
 import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks;
 import org.apache.hadoop.hdfs.server.protocol.StorageReport;
 import org.apache.hadoop.hdfs.server.protocol.VolumeFailureSummary;
+import org.apache.hadoop.hdfs.server.protocol.StorageBlockReport;
+import org.apache.hadoop.hdfs.server.protocol.BlockReportContext;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.ipc.StandbyException;
 import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto.RpcErrorCodeProto;
@@ -90,6 +92,9 @@ public class TestBPOfferService {
   private static final File TEST_BUILD_DATA = PathUtils.getTestDir(TestBPOfferService.class);
   private long firstCallTime = 0; 
   private long secondCallTime = 0;
+  private long firstLeaseId = 0;
+  private long secondLeaseId = 0;
+  private long nextFullBlockReportLeaseId = 1L;
 
   static {
     GenericTestUtils.setLogLevel(DataNode.LOG, Level.ALL);
@@ -169,16 +174,24 @@ public class TestBPOfferService {
   private class HeartbeatAnswer implements Answer<HeartbeatResponse> {
     private final int nnIdx;
 
-    public HeartbeatAnswer(int nnIdx) {
+    HeartbeatAnswer(int nnIdx) {
       this.nnIdx = nnIdx;
     }
 
     @Override
-    public HeartbeatResponse answer(InvocationOnMock invocation) throws Throwable {
+    public HeartbeatResponse answer(InvocationOnMock invocation)
+        throws Throwable {
       heartbeatCounts[nnIdx]++;
+      Boolean requestFullBlockReportLease =
+          (Boolean) invocation.getArguments()[8];
+      long fullBlockReportLeaseId = 0;
+      if (requestFullBlockReportLease) {
+        fullBlockReportLeaseId = nextFullBlockReportLeaseId++;
+      }
+      LOG.info("fullBlockReportLeaseId=" + fullBlockReportLeaseId);
       HeartbeatResponse heartbeatResponse = new HeartbeatResponse(
           datanodeCommands[nnIdx], mockHaStatuses[nnIdx], null,
-          ThreadLocalRandom.current().nextLong() | 1L);
+          fullBlockReportLeaseId);
       //reset the command
       datanodeCommands[nnIdx] = new DatanodeCommand[0];
       return heartbeatResponse;
@@ -186,6 +199,24 @@ public class TestBPOfferService {
   }
 
 
+  private class HeartbeatRegisterAnswer implements Answer<HeartbeatResponse> {
+    private final int nnIdx;
+
+    HeartbeatRegisterAnswer(int nnIdx) {
+      this.nnIdx = nnIdx;
+    }
+
+    @Override
+    public HeartbeatResponse answer(InvocationOnMock invocation)
+        throws Throwable {
+      heartbeatCounts[nnIdx]++;
+      DatanodeCommand[] cmds = new DatanodeCommand[1];
+      cmds[0] = new RegisterCommand();
+      return new HeartbeatResponse(cmds, mockHaStatuses[nnIdx],
+          null, 0L);
+    }
+  }
+
   /**
    * Test that the BPOS can register to talk to two different NNs,
    * sends block reports to both, etc.
@@ -521,6 +552,26 @@ public class TestBPOfferService {
     }, 500, 10000);
   }
 
+  private void waitForRegistration(
+      final DatanodeProtocolClientSideTranslatorPB mockNN, int times)
+      throws Exception {
+    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+      @Override
+      public Boolean get() {
+        try {
+          // The DN should have register to both NNs.
+          // first called by connectToNNAndHandshake, then called by reRegister.
+          Mockito.verify(mockNN, Mockito.times(2))
+              .registerDatanode(Mockito.any());
+          return true;
+        } catch (Throwable t) {
+          LOG.info("waiting on block registerDatanode: " + t.getMessage());
+          return false;
+        }
+      }
+    }, 500, 10000);
+  }
+
   private ReceivedDeletedBlockInfo[] waitForBlockReceived(
       final ExtendedBlock fakeBlock,
       final DatanodeProtocolClientSideTranslatorPB mockNN) throws Exception {
@@ -857,7 +908,7 @@ public class TestBPOfferService {
 
   }
 
-  @Test
+  @Test(timeout = 30000)
   public void testRefreshNameNodes() throws Exception {
 
     BPOfferService bpos = setupBPOSForNNs(mockDn, mockNN1, mockNN2);
@@ -930,4 +981,68 @@ public class TestBPOfferService {
       bpos.join();
     }
   }
+
+  @Test(timeout = 15000)
+  public void testRefreshLeaseId() throws Exception {
+    Mockito.when(mockNN1.sendHeartbeat(
+        Mockito.any(DatanodeRegistration.class),
+        Mockito.any(StorageReport[].class),
+        Mockito.anyLong(),
+        Mockito.anyLong(),
+        Mockito.anyInt(),
+        Mockito.anyInt(),
+        Mockito.anyInt(),
+        Mockito.any(VolumeFailureSummary.class),
+        Mockito.anyBoolean(),
+        Mockito.any(SlowPeerReports.class),
+        Mockito.any(SlowDiskReports.class)))
+        //heartbeat to old NN instance
+        .thenAnswer(new HeartbeatAnswer(0))
+        //heartbeat to new NN instance with Register Command
+        .thenAnswer(new HeartbeatRegisterAnswer(0))
+        .thenAnswer(new HeartbeatAnswer(0));
+
+    Mockito.when(mockNN1.blockReport(
+        Mockito.any(DatanodeRegistration.class),
+        Mockito.anyString(),
+        Mockito.any(StorageBlockReport[].class),
+        Mockito.any(BlockReportContext.class)))
+        .thenAnswer(
+          new Answer() {
+            @Override
+              public Object answer(InvocationOnMock invocation)
+                  throws Throwable {
+                BlockReportContext context =
+                    (BlockReportContext) invocation.getArguments()[3];
+                long leaseId = context.getLeaseId();
+                LOG.info("leaseId = "+leaseId);
+
+                // leaseId == 1 means DN make block report with old leaseId
+                // just reject and wait until DN request for a new leaseId
+                if(leaseId == 1) {
+                  firstLeaseId = leaseId;
+                  throw new ConnectException(
+                          "network is not reachable for test. ");
+                } else {
+                  secondLeaseId = leaseId;
+                  return null;
+                }
+              }
+          });
+
+    BPOfferService bpos = setupBPOSForNNs(mockNN1);
+    bpos.start();
+
+    try {
+      waitForInitialization(bpos);
+      // Should call registration 2 times
+      waitForRegistration(mockNN1, 2);
+      assertEquals(1L, firstLeaseId);
+      while(secondLeaseId != 2L) {
+        Thread.sleep(1000);
+      }
+    } finally {
+      bpos.stop();
+    }
+  }
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
index 6bfc64d8f8f..a197c00bcee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestListCorruptFileBlocks.java
@@ -95,6 +95,7 @@ public class TestListCorruptFileBlocks {
         getNamesystem().listCorruptFileBlocks("/", null);
       assertEquals("Namenode has " + badFiles.size()
           + " corrupt files. Expecting None.", 0, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
 
       // Now deliberately corrupt one block
       String bpid = cluster.getNamesystem().getBlockPoolId();
@@ -128,8 +129,9 @@ public class TestListCorruptFileBlocks {
       // fetch bad file list from namenode. There should be one file.
       badFiles = namenode.getNamesystem().listCorruptFileBlocks("/", null);
       LOG.info("Namenode has bad files. " + badFiles.size());
-      assertTrue("Namenode has " + badFiles.size() + " bad files. Expecting 1.",
-          badFiles.size() == 1);
+      assertEquals("Namenode has " + badFiles.size() + " bad files. " +
+          "Expecting 1.", 1, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
       util.cleanup(fs, "/srcdat10");
     } finally {
       if (cluster != null) { cluster.shutdown(); }
@@ -176,6 +178,7 @@ public class TestListCorruptFileBlocks {
         cluster.getNameNode().getNamesystem().listCorruptFileBlocks("/", null);
       assertEquals("Namenode has " + badFiles.size()
           + " corrupt files. Expecting None.", 0, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
 
       // Now deliberately corrupt one block
       File storageDir = cluster.getInstanceStorageDir(0, 0);
@@ -211,8 +214,9 @@ public class TestListCorruptFileBlocks {
       badFiles = cluster.getNameNode().getNamesystem().
         listCorruptFileBlocks("/", null);
       LOG.info("Namenode has bad files. " + badFiles.size());
-      assertTrue("Namenode has " + badFiles.size() + " bad files. Expecting 1.",
-          badFiles.size() == 1);
+      assertEquals("Namenode has " + badFiles.size() + " bad files. " +
+          "Expecting 1.", 1, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
  
       // restart namenode
       cluster.restartNameNode(0);
@@ -243,8 +247,9 @@ public class TestListCorruptFileBlocks {
       badFiles = cluster.getNameNode().getNamesystem().
         listCorruptFileBlocks("/", null);
       LOG.info("Namenode has bad files. " + badFiles.size());
-      assertTrue("Namenode has " + badFiles.size() + " bad files. Expecting 1.",
-          badFiles.size() == 1);
+      assertEquals("Namenode has " + badFiles.size() + " bad files. " +
+          "Expecting 1.", 1, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
 
       // check that we are still in safe mode
       assertTrue("Namenode is not in safe mode", 
@@ -288,7 +293,8 @@ public class TestListCorruptFileBlocks {
       Collection<FSNamesystem.CorruptFileBlockInfo> corruptFileBlocks = 
         namenode.getNamesystem().listCorruptFileBlocks("/corruptData", null);
       int numCorrupt = corruptFileBlocks.size();
-      assertTrue(numCorrupt == 0);
+      assertEquals(0, numCorrupt);
+      assertCorruptFilesCount(cluster, numCorrupt);
       // delete the blocks
       String bpid = cluster.getNamesystem().getBlockPoolId();
       for (int i = 0; i < 4; i++) {
@@ -328,6 +334,7 @@ public class TestListCorruptFileBlocks {
       // Validate we get all the corrupt files
       LOG.info("Namenode has bad files. " + numCorrupt);
       assertEquals(3, numCorrupt);
+      assertCorruptFilesCount(cluster, numCorrupt);
 
       // test the paging here
       FSNamesystem.CorruptFileBlockInfo[] cfb = corruptFileBlocks
@@ -400,6 +407,7 @@ public class TestListCorruptFileBlocks {
         dfs.listCorruptFileBlocks(new Path("/corruptData"));
       int numCorrupt = countPaths(corruptFileBlocks);
       assertEquals(0, numCorrupt);
+      assertCorruptFilesCount(cluster, numCorrupt);
       // delete the blocks
       String bpid = cluster.getNamesystem().getBlockPoolId();
       // For loop through number of datadirectories per datanode (2)
@@ -436,6 +444,7 @@ public class TestListCorruptFileBlocks {
       // Validate we get all the corrupt files
       LOG.info("Namenode has bad files. " + numCorrupt);
       assertEquals(3, numCorrupt);
+      assertCorruptFilesCount(cluster, numCorrupt);
 
       util.cleanup(fs, "/corruptData");
       util.cleanup(fs, "/goodData");
@@ -477,6 +486,7 @@ public class TestListCorruptFileBlocks {
       assertEquals(
           "Namenode has " + badFiles.size() + " corrupt files. Expecting none.",
           0, badFiles.size());
+      assertCorruptFilesCount(cluster, badFiles.size());
 
       // Now deliberately blocks from all files
       final String bpid = cluster.getNamesystem().getBlockPoolId();
@@ -520,9 +530,9 @@ public class TestListCorruptFileBlocks {
       badFiles = namenode.getNamesystem().
         listCorruptFileBlocks("/srcdat2", null); 
       LOG.info("Namenode has bad files. " + badFiles.size());
-      assertTrue("Namenode has " + badFiles.size() + " bad files. Expecting " + 
-          maxCorruptFileBlocks + ".",
-          badFiles.size() == maxCorruptFileBlocks);
+      assertEquals("Namenode has " + badFiles.size() + " bad files. " +
+          "Expecting " + maxCorruptFileBlocks + ".", maxCorruptFileBlocks,
+          badFiles.size());
 
       CorruptFileBlockIterator iter = (CorruptFileBlockIterator)
         fs.listCorruptFileBlocks(new Path("/srcdat2"));
@@ -566,6 +576,7 @@ public class TestListCorruptFileBlocks {
           .listCorruptFileBlocks(new Path("corruptData"));
       int numCorrupt = countPaths(corruptFileBlocks);
       assertEquals(0, numCorrupt);
+      assertCorruptFilesCount(cluster, numCorrupt);
 
       // delete the blocks
       String bpid = cluster.getNamesystem().getBlockPoolId();
@@ -608,4 +619,16 @@ public class TestListCorruptFileBlocks {
       }
     }
   }
+
+  /**
+   * Asserts that the number of correct files is equal to the expected value.
+   * @param cluster where to get the number of corrupt files from
+   * @param expectedCorrupt the expected number of corrupt files
+   */
+  private void assertCorruptFilesCount(MiniDFSCluster cluster,
+      int expectedCorrupt) {
+    FSNamesystem fs = cluster.getNameNode().getNamesystem();
+    assertEquals("Incorrect number of corrupt files returned", expectedCorrupt,
+        fs.getCorruptFilesCount());
+  }
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
index 858032fb551..f6da894dc19 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
@@ -222,6 +222,11 @@ public class TestNameNodeMXBean {
           "CorruptFiles"));
       assertEquals("Bad value for CorruptFiles", fsn.getCorruptFiles(),
           corruptFiles);
+      // get attribute CorruptFilesCount
+      int corruptFilesCount = (int) (mbs.getAttribute(mxbeanName,
+          "CorruptFilesCount"));
+      assertEquals("Bad value for CorruptFilesCount",
+          fsn.getCorruptFilesCount(), corruptFilesCount);
       // get attribute NameDirStatuses
       String nameDirStatuses = (String) (mbs.getAttribute(mxbeanName,
           "NameDirStatuses"));
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
index 2845670d44f..2bed37ca8c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
@@ -178,8 +178,12 @@ public class TestConsistentReadsObserver {
         // Therefore, the subsequent getFileStatus call should succeed.
         dfs2.getClient().msync();
         dfs2.getFileStatus(testPath);
-        readStatus.set(1);
-      } catch (IOException e) {
+        if (HATestUtil.isSentToAnyOfNameNodes(dfs2, dfsCluster, 2)) {
+          readStatus.set(1);
+        } else {
+          readStatus.set(-1);
+        }
+      } catch (Exception e) {
         e.printStackTrace();
         readStatus.set(-1);
       }
@@ -196,6 +200,71 @@ public class TestConsistentReadsObserver {
     assertEquals(1, readStatus.get());
   }
 
+  // A new client should first contact the active, before using an observer,
+  // to ensure that it is up-to-date with the current state
+  @Test
+  public void testCallFromNewClient() throws Exception {
+    // Set the order of nodes: Observer, Standby, Active
+    // This is to ensure that test doesn't pass trivially because the active is
+    // the first node contacted
+    dfsCluster.transitionToStandby(0);
+    dfsCluster.transitionToObserver(0);
+    dfsCluster.transitionToStandby(2);
+    dfsCluster.transitionToActive(2);
+    try {
+      // 0 == not completed, 1 == succeeded, -1 == failed
+      AtomicInteger readStatus = new AtomicInteger(0);
+
+      // Initialize the proxies for Observer Node.
+      dfs.getClient().getHAServiceState();
+
+      // Advance Observer's state ID so it is ahead of client's.
+      dfs.mkdir(new Path("/test"), FsPermission.getDefault());
+      dfsCluster.getNameNode(2).getRpcServer().rollEditLog();
+      dfsCluster.getNameNode(0)
+          .getNamesystem().getEditLogTailer().doTailEdits();
+
+      dfs.mkdir(testPath, FsPermission.getDefault());
+      assertSentTo(2);
+
+      Configuration conf2 = new Configuration(conf);
+
+      // Disable FS cache so two different DFS clients will be used.
+      conf2.setBoolean("fs.hdfs.impl.disable.cache", true);
+      DistributedFileSystem dfs2 =
+          (DistributedFileSystem) FileSystem.get(conf2);
+      dfs2.getClient().getHAServiceState();
+
+      Thread reader = new Thread(() -> {
+        try {
+          dfs2.getFileStatus(testPath);
+          readStatus.set(1);
+        } catch (Exception e) {
+          e.printStackTrace();
+          readStatus.set(-1);
+        }
+      });
+
+      reader.start();
+
+      Thread.sleep(100);
+      assertEquals(0, readStatus.get());
+
+      dfsCluster.getNameNode(2).getRpcServer().rollEditLog();
+      dfsCluster.getNameNode(0)
+          .getNamesystem().getEditLogTailer().doTailEdits();
+
+      GenericTestUtils.waitFor(() -> readStatus.get() != 0, 100, 10000);
+      assertEquals(1, readStatus.get());
+    } finally {
+      // Put the cluster back the way it was when the test started
+      dfsCluster.transitionToStandby(2);
+      dfsCluster.transitionToObserver(2);
+      dfsCluster.transitionToStandby(0);
+      dfsCluster.transitionToActive(0);
+    }
+  }
+
   @Test
   public void testUncoordinatedCall() throws Exception {
     // make a write call so that client will be ahead of
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
index b94cd2af4a6..cb37361a353 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
@@ -338,9 +338,97 @@ public class TestEditLogTailer {
     }
   }
 
+  @Test
+  public void testStandbyTriggersLogRollsWhenTailInProgressEdits()
+      throws Exception {
+    // Time in seconds to wait for standby to catch up to edits from active
+    final int standbyCatchupWaitTime = 2;
+    // Time in seconds to wait before checking if edit logs are rolled while
+    // expecting no edit log roll
+    final int noLogRollWaitTime = 2;
+    // Time in seconds to wait before checking if edit logs are rolled while
+    // expecting edit log roll
+    final int logRollWaitTime = 3;
+
+    Configuration conf = getConf();
+    conf.setInt(DFSConfigKeys.DFS_HA_LOGROLL_PERIOD_KEY,
+        standbyCatchupWaitTime + noLogRollWaitTime + 1);
+    conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
+    conf.setBoolean(DFSConfigKeys.DFS_HA_TAILEDITS_INPROGRESS_KEY, true);
+
+    MiniDFSCluster cluster = createMiniDFSCluster(conf, 2);
+    if (cluster == null) {
+      fail("failed to start mini cluster.");
+    }
+
+    try {
+      int activeIndex = new Random().nextBoolean() ? 1 : 0;
+      int standbyIndex = (activeIndex == 0) ? 1 : 0;
+      cluster.transitionToActive(activeIndex);
+      NameNode active = cluster.getNameNode(activeIndex);
+      NameNode standby = cluster.getNameNode(standbyIndex);
+
+      long origTxId = active.getNamesystem().getFSImage().getEditLog()
+          .getCurSegmentTxId();
+      for (int i = 0; i < DIRS_TO_MAKE / 2; i++) {
+        NameNodeAdapter.mkdirs(active, getDirPath(i),
+            new PermissionStatus("test", "test",
+            new FsPermission((short)00755)), true);
+      }
+
+      long activeTxId = active.getNamesystem().getFSImage().getEditLog()
+          .getLastWrittenTxId();
+      waitForStandbyToCatchUpWithInProgressEdits(standby, activeTxId,
+          standbyCatchupWaitTime);
+
+      for (int i = DIRS_TO_MAKE / 2; i < DIRS_TO_MAKE; i++) {
+        NameNodeAdapter.mkdirs(active, getDirPath(i),
+            new PermissionStatus("test", "test",
+            new FsPermission((short)00755)), true);
+      }
+
+      boolean exceptionThrown = false;
+      try {
+        checkForLogRoll(active, origTxId, noLogRollWaitTime);
+      } catch (TimeoutException e) {
+        exceptionThrown = true;
+      }
+      assertTrue(exceptionThrown);
+
+      checkForLogRoll(active, origTxId, logRollWaitTime);
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
+  private static void waitForStandbyToCatchUpWithInProgressEdits(
+      final NameNode standby, final long activeTxId,
+      int maxWaitSec) throws Exception {
+    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+      @Override
+      public Boolean get() {
+        long standbyTxId = standby.getNamesystem().getFSImage()
+            .getLastAppliedTxId();
+        return (standbyTxId >= activeTxId);
+      }
+    }, 100, maxWaitSec * 1000);
+  }
+
+  private static void checkForLogRoll(final NameNode active,
+      final long origTxId, int maxWaitSec) throws Exception {
+    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+      @Override
+      public Boolean get() {
+        long curSegmentTxId = active.getNamesystem().getFSImage().getEditLog()
+            .getCurSegmentTxId();
+        return (origTxId != curSegmentTxId);
+      }
+    }, 100, maxWaitSec * 1000);
+  }
+
   private static MiniDFSCluster createMiniDFSCluster(Configuration conf,
       int nnCount) throws IOException {
-    int basePort = 10060 + new Random().nextInt(100) * 2;
+    int basePort = 10060 + new Random().nextInt(1000) * 2;
 
     // By passing in basePort, name node will have IPC port set,
     // which is needed for enabling roll log.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
index e233b631282..58efc0fa2e3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
@@ -254,10 +254,10 @@ public class TestFailureToReadEdits {
     
     // Once the standby catches up, it should notice that it needs to
     // do a checkpoint and save one to its local directories.
-    HATestUtil.waitForCheckpoint(cluster, 1, ImmutableList.of(0, 3));
+    HATestUtil.waitForCheckpoint(cluster, 1, ImmutableList.of(0, 5));
     
     // It should also upload it back to the active.
-    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 3));
+    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 5));
     
     causeFailureOnEditLogRead();
     
@@ -272,15 +272,15 @@ public class TestFailureToReadEdits {
     }
     
     // 5 because we should get OP_START_LOG_SEGMENT and one successful OP_MKDIR
-    HATestUtil.waitForCheckpoint(cluster, 1, ImmutableList.of(0, 3, 5));
+    HATestUtil.waitForCheckpoint(cluster, 1, ImmutableList.of(0, 5, 7));
     
     // It should also upload it back to the active.
-    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 3, 5));
+    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 5, 7));
 
     // Restart the active NN
     cluster.restartNameNode(0);
     
-    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 3, 5));
+    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 5, 7));
     
     FileSystem fs0 = null;
     try {
@@ -309,7 +309,7 @@ public class TestFailureToReadEdits {
     HATestUtil.waitForStandbyToCatchUp(nn0, nn1);
     
     // It should also upload it back to the active.
-    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 3));
+    HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(0, 5));
     
     causeFailureOnEditLogRead();
     
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 3d292c2ed0f..9d9adcbadb0 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -33,5 +33,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-ozone-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientUtils.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientUtils.java
index 9239db8a195..96515188874 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientUtils.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientUtils.java
@@ -19,17 +19,28 @@ package org.apache.hadoop.ozone.client;
 
 import org.apache.hadoop.hdds.client.OzoneQuota;
 import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.rest.response.*;
+import org.apache.ratis.protocol.AlreadyClosedException;
+import org.apache.ratis.protocol.RaftRetryFailureException;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 /** A utility class for OzoneClient. */
 public final class OzoneClientUtils {
 
   private OzoneClientUtils() {}
 
+  private static final List<Class<? extends Exception>> EXCEPTION_LIST =
+      new ArrayList<Class<? extends Exception>>() {{
+        add(TimeoutException.class);
+        add(ContainerNotOpenException.class);
+        add(RaftRetryFailureException.class);
+        add(AlreadyClosedException.class);
+      }};
   /**
    * Returns a BucketInfo object constructed using fields of the input
    * OzoneBucket object.
@@ -110,4 +121,8 @@ public final class OzoneClientUtils {
     keyInfo.setFileEncryptionInfo(key.getFileEncryptionInfo());
     return keyInfo;
   }
+
+  public static List<Class<? extends Exception>> getExceptionList() {
+    return EXCEPTION_LIST;
+  }
 }
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
index 5ae7e8bf7e2..16a825ff0ad 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockOutputStreamEntry.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.apache.hadoop.hdds.client.BlockID;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
     .ChecksumType;
 import org.apache.hadoop.hdds.scm.XceiverClientManager;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.Token;
 
+import java.util.Collection;
+
 /**
  * Helper class used inside {@link BlockOutputStream}.
  * */
@@ -159,6 +162,14 @@ public final class BlockOutputStreamEntry extends OutputStream {
     }
   }
 
+  Collection<DatanodeDetails> getFailedServers() throws IOException {
+    if (outputStream != null) {
+      BlockOutputStream out = (BlockOutputStream) this.outputStream;
+      return out.getFailedServers();
+    }
+    return null;
+  }
+
   long getWrittenDataLength() throws IOException {
     if (outputStream != null) {
       BlockOutputStream out = (BlockOutputStream) this.outputStream;
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyOutputStream.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyOutputStream.java
index 3b0e51b4eba..7035c73ce98 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyOutputStream.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyOutputStream.java
@@ -21,20 +21,22 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.fs.FSExceptionMessages;
 import org.apache.hadoop.fs.FileEncryptionInfo;
+import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
     .ChecksumType;
-import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
 import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerNotOpenException;
 import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline;
 import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
 import org.apache.hadoop.ozone.OzoneConfigKeys;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+import org.apache.hadoop.ozone.client.OzoneClientUtils;
 import org.apache.hadoop.ozone.om.helpers.*;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.hdds.scm.XceiverClientManager;
-import org.apache.hadoop.hdds.scm.container.common.helpers
-    .StorageContainerException;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.ratis.protocol.AlreadyClosedException;
 import org.apache.ratis.protocol.RaftRetryFailureException;
@@ -46,7 +48,7 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
+import java.util.Collection;
 import java.util.ListIterator;
 import java.util.concurrent.TimeoutException;
 
@@ -84,7 +86,7 @@ public class KeyOutputStream extends OutputStream {
   private List<ByteBuffer> bufferList;
   private OmMultipartCommitUploadPartInfo commitUploadPartInfo;
   private FileEncryptionInfo feInfo;
-
+  private ExcludeList excludeList;
   /**
    * A constructor for testing purpose only.
    */
@@ -181,6 +183,7 @@ public class KeyOutputStream extends OutputStream {
     Preconditions.checkState(streamBufferMaxSize % streamBufferFlushSize == 0);
     Preconditions.checkState(blockSize % streamBufferMaxSize == 0);
     this.bufferList = new ArrayList<>();
+    this.excludeList = new ExcludeList();
   }
 
   /**
@@ -307,9 +310,8 @@ public class KeyOutputStream extends OutputStream {
           current.write(b, off, writeLen);
         }
       } catch (IOException ioe) {
-        boolean retryFailure = checkForRetryFailure(ioe);
-        if (checkIfContainerIsClosed(ioe) || checkIfTimeoutException(ioe)
-            || retryFailure) {
+        Throwable t = checkForException(ioe);
+        if (t != null) {
           // for the current iteration, totalDataWritten - currentPos gives the
           // amount of data already written to the buffer
 
@@ -321,7 +323,7 @@ public class KeyOutputStream extends OutputStream {
           writeLen = retry ? (int) len :
               (int) (current.getWrittenDataLength() - currentPos);
           LOG.debug("writeLen {}, total len {}", writeLen, len);
-          handleException(current, currentStreamIndex, retryFailure);
+          handleException(current, currentStreamIndex, t);
         } else {
           throw ioe;
         }
@@ -340,8 +342,10 @@ public class KeyOutputStream extends OutputStream {
    * Discards the subsequent pre allocated blocks and removes the streamEntries
    * from the streamEntries list for the container which is closed.
    * @param containerID id of the closed container
+   * @param pipelineId id of the associated pipeline
    */
-  private void discardPreallocatedBlocks(long containerID) {
+  private void discardPreallocatedBlocks(long containerID,
+      PipelineID pipelineId) {
     // currentStreamIndex < streamEntries.size() signifies that, there are still
     // pre allocated blocks available.
     if (currentStreamIndex < streamEntries.size()) {
@@ -349,8 +353,10 @@ public class KeyOutputStream extends OutputStream {
           streamEntries.listIterator(currentStreamIndex);
       while (streamEntryIterator.hasNext()) {
         BlockOutputStreamEntry streamEntry = streamEntryIterator.next();
-        if (streamEntry.getBlockID().getContainerID()
-            == containerID && streamEntry.getCurrentPosition() == 0) {
+        if (((pipelineId != null && streamEntry.getPipeline().getId()
+            .equals(pipelineId)) || (containerID != -1
+            && streamEntry.getBlockID().getContainerID() == containerID))
+            && streamEntry.getCurrentPosition() == 0) {
           streamEntryIterator.remove();
         }
       }
@@ -382,17 +388,39 @@ public class KeyOutputStream extends OutputStream {
    *
    * @param streamEntry StreamEntry
    * @param streamIndex Index of the entry
-   * @param retryFailure if true the xceiverClient needs to be invalidated in
-   *                     the client cache.
+   * @param exception actual exception that occurred
    * @throws IOException Throws IOException if Write fails
    */
   private void handleException(BlockOutputStreamEntry streamEntry,
-      int streamIndex, boolean retryFailure) throws IOException {
+      int streamIndex, Throwable exception) throws IOException {
+    boolean retryFailure = checkForRetryFailure(exception);
+    boolean closedContainerException = false;
+    if (!retryFailure) {
+      closedContainerException = checkIfContainerIsClosed(exception);
+    }
+    PipelineID pipelineId = null;
     long totalSuccessfulFlushedData =
         streamEntry.getTotalSuccessfulFlushedData();
     //set the correct length for the current stream
     streamEntry.setCurrentPosition(totalSuccessfulFlushedData);
     long bufferedDataLen = computeBufferData();
+    LOG.warn("Encountered exception {}", exception);
+    LOG.info(
+        "The last committed block length is {}, uncommitted data length is {}",
+        totalSuccessfulFlushedData, bufferedDataLen);
+    Preconditions.checkArgument(bufferedDataLen <= streamBufferMaxSize);
+    long containerId = streamEntry.getBlockID().getContainerID();
+    Collection<DatanodeDetails> failedServers = streamEntry.getFailedServers();
+    Preconditions.checkNotNull(failedServers);
+    if (!failedServers.isEmpty()) {
+      excludeList.addDatanodes(failedServers);
+    }
+    if (checkIfContainerIsClosed(exception)) {
+      excludeList.addConatinerId(ContainerID.valueof(containerId));
+    } else if (retryFailure || exception instanceof TimeoutException) {
+      pipelineId = streamEntry.getPipeline().getId();
+      excludeList.addPipeline(pipelineId);
+    }
     // just clean up the current stream.
     streamEntry.cleanup(retryFailure);
     if (bufferedDataLen > 0) {
@@ -405,21 +433,21 @@ public class KeyOutputStream extends OutputStream {
       streamEntries.remove(streamIndex);
       currentStreamIndex -= 1;
     }
-    // discard subsequent pre allocated blocks from the streamEntries list
-    // from the closed container
-    discardPreallocatedBlocks(streamEntry.getBlockID().getContainerID());
-  }
 
-  private boolean checkIfContainerIsClosed(IOException ioe) {
-    if (ioe.getCause() != null) {
-      return checkForException(ioe, ContainerNotOpenException.class) || Optional
-          .of(ioe.getCause())
-          .filter(e -> e instanceof StorageContainerException)
-          .map(e -> (StorageContainerException) e)
-          .filter(sce -> sce.getResult() == Result.CLOSED_CONTAINER_IO)
-          .isPresent();
+    if (closedContainerException) {
+      // discard subsequent pre allocated blocks from the streamEntries list
+      // from the closed container
+      discardPreallocatedBlocks(streamEntry.getBlockID().getContainerID(),
+          null);
+    } else {
+      // In case there is timeoutException or Watch for commit happening over
+      // majority or the client connection failure to the leader in the
+      // pipeline, just discard all the preallocated blocks on this pipeline.
+      // Next block allocation will happen with excluding this specific pipeline
+      // This will ensure if 2 way commit happens , it cannot span over multiple
+      // blocks
+      discardPreallocatedBlocks(-1, pipelineId);
     }
-    return false;
   }
 
   /**
@@ -427,31 +455,27 @@ public class KeyOutputStream extends OutputStream {
    * In case of retry failure, ratis client throws RaftRetryFailureException
    * and all succeeding operations are failed with AlreadyClosedException.
    */
-  private boolean checkForRetryFailure(IOException ioe) {
-    return checkForException(ioe, RaftRetryFailureException.class,
-        AlreadyClosedException.class);
+  private boolean checkForRetryFailure(Throwable t) {
+    return t instanceof RaftRetryFailureException
+        || t instanceof AlreadyClosedException;
   }
 
-  private boolean checkForException(IOException ioe, Class... classes) {
+  private boolean checkIfContainerIsClosed(Throwable t) {
+    return t instanceof ContainerNotOpenException;
+  }
+
+  private Throwable checkForException(IOException ioe) {
     Throwable t = ioe.getCause();
     while (t != null) {
-      for (Class cls : classes) {
+      for (Class<? extends Exception> cls : OzoneClientUtils
+          .getExceptionList()) {
         if (cls.isInstance(t)) {
-          return true;
+          return t;
         }
       }
       t = t.getCause();
     }
-    return false;
-  }
-
-  private boolean checkIfTimeoutException(IOException ioe) {
-    if (ioe.getCause() != null) {
-      return Optional.of(ioe.getCause())
-          .filter(e -> e instanceof TimeoutException).isPresent();
-    } else {
-      return false;
-    }
+    return null;
   }
 
   private long getKeyLength() {
@@ -469,7 +493,8 @@ public class KeyOutputStream extends OutputStream {
    * @throws IOException
    */
   private void allocateNewBlock(int index) throws IOException {
-    OmKeyLocationInfo subKeyInfo = omClient.allocateBlock(keyArgs, openID);
+    OmKeyLocationInfo subKeyInfo =
+        omClient.allocateBlock(keyArgs, openID, excludeList);
     addKeyLocationInfo(subKeyInfo);
   }
 
@@ -495,19 +520,25 @@ public class KeyOutputStream extends OutputStream {
     BlockOutputStreamEntry entry = streamEntries.get(streamIndex);
     if (entry != null) {
       try {
+        Collection<DatanodeDetails> failedServers = entry.getFailedServers();
+
+        // failed servers can be null in case there is no data written in the
+        // stream
+        if (failedServers != null && !failedServers.isEmpty()) {
+          excludeList.addDatanodes(failedServers);
+        }
         if (close) {
           entry.close();
         } else {
           entry.flush();
         }
       } catch (IOException ioe) {
-        boolean retryFailure = checkForRetryFailure(ioe);
-        if (checkIfContainerIsClosed(ioe) || checkIfTimeoutException(ioe)
-            || retryFailure) {
+        Throwable t = checkForException(ioe);
+        if (t != null) {
           // This call will allocate a new streamEntry and write the Data.
           // Close needs to be retried on the newly allocated streamEntry as
           // as well.
-          handleException(entry, streamIndex, retryFailure);
+          handleException(entry, streamIndex, t);
           handleFlushOrClose(close);
         } else {
           throw ioe;
@@ -564,6 +595,11 @@ public class KeyOutputStream extends OutputStream {
     return feInfo;
   }
 
+  @VisibleForTesting
+  public ExcludeList getExcludeList() {
+    return excludeList;
+  }
+
   /**
    * Builder class of KeyOutputStream.
    */
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
index 494afae7e87..2bf90892c72 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/protocol/ClientProtocol.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.client.ReplicationFactor;
 import org.apache.hadoop.hdds.client.ReplicationType;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartInfo;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteInfo;
 
@@ -510,5 +510,5 @@ public interface ClientProtocol {
   S3SecretValue getS3Secret(String kerberosID) throws IOException;
 
   @VisibleForTesting
-  OMProxyProvider getOMProxyProvider();
+  OMFailoverProxyProvider getOMProxyProvider();
 }
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java
index b69d9728bf0..eea28091d3b 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java
@@ -42,8 +42,8 @@ import org.apache.hadoop.ozone.client.rest.headers.Header;
 import org.apache.hadoop.ozone.client.rest.response.BucketInfo;
 import org.apache.hadoop.ozone.client.rest.response.KeyInfoDetails;
 import org.apache.hadoop.ozone.client.rest.response.VolumeInfo;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartInfo;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteInfo;
 import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
@@ -725,7 +725,7 @@ public class RestClient implements ClientProtocol {
   }
 
   @Override
-  public OMProxyProvider getOMProxyProvider() {
+  public OMFailoverProxyProvider getOMProxyProvider() {
     return null;
   }
 
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 0875046bda4..7fab65041f3 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -50,8 +50,8 @@ import org.apache.hadoop.ozone.client.io.LengthInputStream;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
 import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.BucketEncryptionKeyInfo;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.OmBucketArgs;
 import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
@@ -66,7 +66,8 @@ import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
 import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
 import org.apache.hadoop.ozone.om.helpers.ServiceInfo;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
-import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
+import org.apache.hadoop.ozone.om.protocolPB
+    .OzoneManagerProtocolClientSideTranslatorPB;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.ozone.OzoneAcl;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
@@ -85,6 +86,7 @@ import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.io.Text;
 import org.apache.logging.log4j.util.Strings;
+import org.apache.ratis.protocol.ClientId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -107,7 +109,6 @@ public class RpcClient implements ClientProtocol {
   private final OzoneConfiguration conf;
   private final StorageContainerLocationProtocol
       storageContainerLocationClient;
-  private final OMProxyProvider omProxyProvider;
   private final OzoneManagerProtocol ozoneManagerClient;
   private final XceiverClientManager xceiverClientManager;
   private final int chunkSize;
@@ -121,6 +122,7 @@ public class RpcClient implements ClientProtocol {
   private final long streamBufferMaxSize;
   private final long blockSize;
   private final long watchTimeout;
+  private final ClientId clientId = ClientId.randomId();
 
    /**
     * Creates RpcClient instance with the given configuration.
@@ -135,13 +137,8 @@ public class RpcClient implements ClientProtocol {
         OMConfigKeys.OZONE_OM_USER_RIGHTS_DEFAULT);
     this.groupRights = conf.getEnum(OMConfigKeys.OZONE_OM_GROUP_RIGHTS,
         OMConfigKeys.OZONE_OM_GROUP_RIGHTS_DEFAULT);
-    RPC.setProtocolEngine(conf, OzoneManagerProtocolPB.class,
-        ProtobufRpcEngine.class);
-    this.omProxyProvider = new OMProxyProvider(conf, ugi);
-    this.ozoneManagerClient =
-        TracingUtil.createProxy(
-            this.omProxyProvider.getProxy(),
-            OzoneManagerProtocol.class);
+    this.ozoneManagerClient = new OzoneManagerProtocolClientSideTranslatorPB(
+        this.conf, clientId.toString(), ugi);
 
     long scmVersion =
         RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class);
@@ -492,8 +489,8 @@ public class RpcClient implements ClientProtocol {
 
   @Override
   @VisibleForTesting
-  public OMProxyProvider getOMProxyProvider() {
-    return omProxyProvider;
+  public OMFailoverProxyProvider getOMProxyProvider() {
+    return ozoneManagerClient.getOMFailoverProxyProvider();
   }
 
   @Override
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyProvider.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyProvider.java
deleted file mode 100644
index 574cb5f1315..00000000000
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/OMProxyProvider.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.ozone.client.rpc.ha;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.ipc.Client;
-import org.apache.hadoop.ipc.RPC;
-import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.ozone.OmUtils;
-import org.apache.hadoop.ozone.om.protocolPB
-    .OzoneManagerProtocolClientSideTranslatorPB;
-import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.ratis.protocol.ClientId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY;
-
-/**
- * A failover proxy provider implementation which allows clients to configure
- * multiple OMs to connect to. In case of OM failover, client can try
- * connecting to another OM node from the list of proxies.
- */
-public class OMProxyProvider implements Closeable {
-
-  public static final Logger LOG =
-      LoggerFactory.getLogger(OMProxyProvider.class);
-
-  private List<OMProxyInfo> omProxies;
-
-  private int currentProxyIndex = 0;
-
-  private final Configuration conf;
-  private final long omVersion;
-  private final UserGroupInformation ugi;
-  private ClientId clientId = ClientId.randomId();
-
-  public OMProxyProvider(Configuration configuration,
-      UserGroupInformation ugi) {
-    this.conf = configuration;
-    this.omVersion = RPC.getProtocolVersion(OzoneManagerProtocolPB.class);
-    this.ugi = ugi;
-    loadOMClientConfigs(conf);
-  }
-
-  private void loadOMClientConfigs(Configuration config) {
-    this.omProxies = new ArrayList<>();
-
-    Collection<String> omServiceIds = config.getTrimmedStringCollection(
-        OZONE_OM_SERVICE_IDS_KEY);
-
-    if (omServiceIds.size() > 1) {
-      throw new IllegalArgumentException("Multi-OM Services is not supported." +
-          " Please configure only one OM Service ID in " +
-          OZONE_OM_SERVICE_IDS_KEY);
-    }
-
-    for (String serviceId : OmUtils.emptyAsSingletonNull(omServiceIds)) {
-      Collection<String> omNodeIds = OmUtils.getOMNodeIds(config, serviceId);
-
-      for (String nodeId : OmUtils.emptyAsSingletonNull(omNodeIds)) {
-
-        String rpcAddrKey = OmUtils.addKeySuffixes(OZONE_OM_ADDRESS_KEY,
-            serviceId, nodeId);
-        String rpcAddrStr = OmUtils.getOmRpcAddress(config, rpcAddrKey);
-        if (rpcAddrStr == null) {
-          continue;
-        }
-
-        InetSocketAddress addr = NetUtils.createSocketAddr(rpcAddrStr);
-
-        // Add the OM client proxy info to list of proxies
-        if (addr != null) {
-          OMProxyInfo omProxyInfo = new OMProxyInfo(addr);
-          omProxies.add(omProxyInfo);
-        } else {
-          LOG.error("Failed to create OM proxy at address {}", rpcAddrStr);
-        }
-      }
-    }
-
-    if (omProxies.isEmpty()) {
-      throw new IllegalArgumentException("Could not find any configured " +
-          "addresses for OM. Please configure the system with "
-          + OZONE_OM_ADDRESS_KEY);
-    }
-  }
-
-  private OzoneManagerProtocolClientSideTranslatorPB getOMClient(
-      InetSocketAddress omAddress) throws IOException {
-    return new OzoneManagerProtocolClientSideTranslatorPB(
-        RPC.getProxy(OzoneManagerProtocolPB.class, omVersion, omAddress, ugi,
-            conf, NetUtils.getDefaultSocketFactory(conf),
-            Client.getRpcTimeout(conf)), clientId.toString());
-  }
-
-  /**
-   * Get the proxy object which should be used until the next failover event
-   * occurs. RPC proxy object is intialized lazily.
-   * @return the OM proxy object to invoke methods upon
-   */
-  public synchronized OzoneManagerProtocolClientSideTranslatorPB getProxy() {
-    OMProxyInfo currentOMProxyInfo = omProxies.get(currentProxyIndex);
-    return createOMClientIfNeeded(currentOMProxyInfo);
-  }
-
-  private OzoneManagerProtocolClientSideTranslatorPB createOMClientIfNeeded(
-      OMProxyInfo proxyInfo) {
-    if (proxyInfo.getOMProxy() == null) {
-      try {
-        proxyInfo.setOMProxy(getOMClient(proxyInfo.getAddress()));
-      } catch (IOException ioe) {
-        LOG.error("{} Failed to create RPC proxy to OM at {}",
-            this.getClass().getSimpleName(), proxyInfo.getAddress(), ioe);
-        throw new RuntimeException(ioe);
-      }
-    }
-    return proxyInfo.getOMProxy();
-  }
-
-  /**
-   * Called whenever an error warrants failing over. It is determined by the
-   * retry policy.
-   */
-  public void performFailover() {
-    incrementProxyIndex();
-  }
-
-  synchronized void incrementProxyIndex() {
-    currentProxyIndex = (currentProxyIndex + 1) % omProxies.size();
-  }
-
-  /**
-   * Close all the proxy objects which have been opened over the lifetime of
-   * the proxy provider.
-   */
-  @Override
-  public synchronized void close() throws IOException {
-    for (OMProxyInfo proxy : omProxies) {
-      OzoneManagerProtocolClientSideTranslatorPB omProxy = proxy.getOMProxy();
-      if (omProxy != null) {
-        RPC.stopProxy(omProxy);
-      }
-    }
-  }
-
-  @VisibleForTesting
-  public List<OMProxyInfo> getOMProxies() {
-    return omProxies;
-  }
-}
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 64b855e5980..fc8d84ed092 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -34,6 +34,65 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs-client</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.squareup.okhttp</groupId>
+          <artifactId>okhttp</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-scm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-container-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-tools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index ab251cbeec4..7b134715348 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -183,6 +183,13 @@ public final class OMConfigKeys {
       OZONE_OM_RATIS_SERVER_FAILURE_TIMEOUT_DURATION_DEFAULT
       = TimeDuration.valueOf(120, TimeUnit.SECONDS);
 
+  // OM Leader server role check interval
+  public static final String OZONE_OM_RATIS_SERVER_ROLE_CHECK_INTERVAL_KEY
+      = "ozone.om.ratis.server.role.check.interval";
+  public static final TimeDuration
+      OZONE_OM_RATIS_SERVER_ROLE_CHECK_INTERVAL_DEFAULT
+      = TimeDuration.valueOf(15, TimeUnit.SECONDS);
+
   public static final String OZONE_OM_KERBEROS_KEYTAB_FILE_KEY = "ozone.om."
       + "kerberos.keytab.file";
   public static final String OZONE_OM_KERBEROS_PRINCIPAL_KEY = "ozone.om"
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/NotLeaderException.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/NotLeaderException.java
new file mode 100644
index 00000000000..974ab0e5edd
--- /dev/null
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/NotLeaderException.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.om.exceptions;
+
+import java.io.IOException;
+
+/**
+ * Exception thrown by
+ * {@link org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB} when
+ * a read request is received by a non leader OM node.
+ */
+public class NotLeaderException extends IOException {
+
+  private final String currentPeerId;
+  private final String leaderPeerId;
+
+  public NotLeaderException(String currentPeerIdStr) {
+    super("OM " + currentPeerIdStr + " is not the leader. Could not " +
+        "determine the leader node.");
+    this.currentPeerId = currentPeerIdStr;
+    this.leaderPeerId = null;
+  }
+
+  public NotLeaderException(String currentPeerIdStr,
+      String suggestedLeaderPeerIdStr) {
+    super("OM " + currentPeerIdStr + " is not the leader. Suggested leader is "
+        + suggestedLeaderPeerIdStr);
+    this.currentPeerId = currentPeerIdStr;
+    this.leaderPeerId = suggestedLeaderPeerIdStr;
+  }
+
+  public String getSuggestedLeaderNodeId() {
+    return leaderPeerId;
+  }
+}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProvider.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProvider.java
new file mode 100644
index 00000000000..b4a48573685
--- /dev/null
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProvider.java
@@ -0,0 +1,275 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.om.ha;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.io.retry.FailoverProxyProvider;
+import org.apache.hadoop.ipc.Client;
+import org.apache.hadoop.ipc.ProtobufRpcEngine;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.ozone.OmUtils;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY;
+
+/**
+ * A failover proxy provider implementation which allows clients to configure
+ * multiple OMs to connect to. In case of OM failover, client can try
+ * connecting to another OM node from the list of proxies.
+ */
+public class OMFailoverProxyProvider implements
+    FailoverProxyProvider<OzoneManagerProtocolPB>, Closeable {
+
+  public static final Logger LOG =
+      LoggerFactory.getLogger(OMFailoverProxyProvider.class);
+
+  // Map of OMNodeID to its proxy
+  private Map<String, OMProxyInfo> omProxies;
+  private List<String> omNodeIDList;
+
+  private String currentProxyOMNodeId;
+  private int currentProxyIndex;
+
+  private final Configuration conf;
+  private final long omVersion;
+  private final UserGroupInformation ugi;
+
+  public OMFailoverProxyProvider(OzoneConfiguration configuration,
+      UserGroupInformation ugi) throws IOException {
+    this.conf = configuration;
+    this.omVersion = RPC.getProtocolVersion(OzoneManagerProtocolPB.class);
+    this.ugi = ugi;
+    loadOMClientConfigs(conf);
+
+    currentProxyIndex = 0;
+    currentProxyOMNodeId = omNodeIDList.get(currentProxyIndex);
+  }
+
+  /**
+   * Class to store proxy information.
+   */
+  public final class OMProxyInfo
+      extends FailoverProxyProvider.ProxyInfo<OzoneManagerProtocolPB> {
+    private InetSocketAddress address;
+
+    OMProxyInfo(OzoneManagerProtocolPB proxy, String proxyInfoStr,
+        InetSocketAddress addr) {
+      super(proxy, proxyInfoStr);
+      this.address = addr;
+    }
+
+    public InetSocketAddress getAddress() {
+      return address;
+    }
+  }
+
+  private void loadOMClientConfigs(Configuration config) throws IOException {
+    this.omProxies = new HashMap<>();
+    this.omNodeIDList = new ArrayList<>();
+
+    Collection<String> omServiceIds = config.getTrimmedStringCollection(
+        OZONE_OM_SERVICE_IDS_KEY);
+
+    if (omServiceIds.size() > 1) {
+      throw new IllegalArgumentException("Multi-OM Services is not supported." +
+          " Please configure only one OM Service ID in " +
+          OZONE_OM_SERVICE_IDS_KEY);
+    }
+
+    for (String serviceId : OmUtils.emptyAsSingletonNull(omServiceIds)) {
+      Collection<String> omNodeIds = OmUtils.getOMNodeIds(config, serviceId);
+
+      for (String nodeId : OmUtils.emptyAsSingletonNull(omNodeIds)) {
+
+        String rpcAddrKey = OmUtils.addKeySuffixes(OZONE_OM_ADDRESS_KEY,
+            serviceId, nodeId);
+        String rpcAddrStr = OmUtils.getOmRpcAddress(config, rpcAddrKey);
+        if (rpcAddrStr == null) {
+          continue;
+        }
+
+        InetSocketAddress addr = NetUtils.createSocketAddr(rpcAddrStr);
+
+        // Add the OM client proxy info to list of proxies
+        if (addr != null) {
+          StringBuilder proxyInfo = new StringBuilder()
+              .append(nodeId).append("(")
+              .append(NetUtils.getHostPortString(addr)).append(")");
+          OMProxyInfo omProxyInfo = new OMProxyInfo(null,
+              proxyInfo.toString(), addr);
+
+          // For a non-HA OM setup, nodeId might be null. If so, we assign it
+          // a dummy value
+          if (nodeId == null) {
+            nodeId = OzoneConsts.OM_NODE_ID_DUMMY;
+          }
+          omProxies.put(nodeId, omProxyInfo);
+          omNodeIDList.add(nodeId);
+
+        } else {
+          LOG.error("Failed to create OM proxy for {} at address {}",
+              nodeId, rpcAddrStr);
+        }
+      }
+    }
+
+    if (omProxies.isEmpty()) {
+      throw new IllegalArgumentException("Could not find any configured " +
+          "addresses for OM. Please configure the system with "
+          + OZONE_OM_ADDRESS_KEY);
+    }
+  }
+
+  @VisibleForTesting
+  public synchronized String getCurrentProxyOMNodeId() {
+    return currentProxyOMNodeId;
+  }
+
+  private OzoneManagerProtocolPB createOMProxy(InetSocketAddress omAddress)
+      throws IOException {
+    RPC.setProtocolEngine(conf, OzoneManagerProtocolPB.class,
+        ProtobufRpcEngine.class);
+    return RPC.getProxy(OzoneManagerProtocolPB.class, omVersion, omAddress, ugi,
+        conf, NetUtils.getDefaultSocketFactory(conf),
+        Client.getRpcTimeout(conf));
+  }
+
+  /**
+   * Get the proxy object which should be used until the next failover event
+   * occurs. RPC proxy object is intialized lazily.
+   * @return the OM proxy object to invoke methods upon
+   */
+  @Override
+  public synchronized OMProxyInfo getProxy() {
+    OMProxyInfo currentOMProxyInfo = omProxies.get(currentProxyOMNodeId);
+    createOMProxyIfNeeded(currentOMProxyInfo);
+    return currentOMProxyInfo;
+  }
+
+  /**
+   * Creates OM proxy object if it does not already exist.
+   */
+  private OMProxyInfo createOMProxyIfNeeded(OMProxyInfo proxyInfo) {
+    if (proxyInfo.proxy == null) {
+      try {
+        proxyInfo.proxy = createOMProxy(proxyInfo.address);
+      } catch (IOException ioe) {
+        LOG.error("{} Failed to create RPC proxy to OM at {}",
+            this.getClass().getSimpleName(), proxyInfo.address, ioe);
+        throw new RuntimeException(ioe);
+      }
+    }
+    return proxyInfo;
+  }
+
+  /**
+   * Called whenever an error warrants failing over. It is determined by the
+   * retry policy.
+   */
+  @Override
+  public void performFailover(OzoneManagerProtocolPB currentProxy) {
+    int newProxyIndex = incrementProxyIndex();
+    LOG.debug("Failing over OM proxy to index: {}, nodeId: {}",
+        newProxyIndex, omNodeIDList.get(newProxyIndex));
+  }
+
+  /**
+   * Update the proxy index to the next proxy in the list.
+   * @return the new proxy index
+   */
+  private synchronized int incrementProxyIndex() {
+    currentProxyIndex = (currentProxyIndex + 1) % omProxies.size();
+    currentProxyOMNodeId = omNodeIDList.get(currentProxyIndex);
+    return currentProxyIndex;
+  }
+
+  @Override
+  public Class<OzoneManagerProtocolPB> getInterface() {
+    return OzoneManagerProtocolPB.class;
+  }
+
+  /**
+   * Performs failover if the leaderOMNodeId returned through OMReponse does
+   * not match the current leaderOMNodeId cached by the proxy provider.
+   */
+  public void performFailoverIfRequired(String newLeaderOMNodeId) {
+    if (newLeaderOMNodeId == null) {
+      LOG.debug("No suggested leader nodeId. Performing failover to next peer" +
+          " node");
+      performFailover(null);
+    } else {
+      if (updateLeaderOMNodeId(newLeaderOMNodeId)) {
+        LOG.debug("Failing over OM proxy to nodeId: {}", newLeaderOMNodeId);
+      }
+    }
+  }
+
+  /**
+   * Failover to the OM proxy specified by the new leader OMNodeId.
+   * @param newLeaderOMNodeId OMNodeId to failover to.
+   * @return true if failover is successful, false otherwise.
+   */
+  synchronized boolean updateLeaderOMNodeId(String newLeaderOMNodeId) {
+    if (!currentProxyOMNodeId.equals(newLeaderOMNodeId)) {
+      if (omProxies.containsKey(newLeaderOMNodeId)) {
+        currentProxyOMNodeId = newLeaderOMNodeId;
+        currentProxyIndex = omNodeIDList.indexOf(currentProxyOMNodeId);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Close all the proxy objects which have been opened over the lifetime of
+   * the proxy provider.
+   */
+  @Override
+  public synchronized void close() throws IOException {
+    for (OMProxyInfo proxy : omProxies.values()) {
+      OzoneManagerProtocolPB omProxy = proxy.proxy;
+      if (omProxy != null) {
+        RPC.stopProxy(omProxy);
+      }
+    }
+  }
+
+  @VisibleForTesting
+  public List<OMProxyInfo> getOMProxies() {
+    return new ArrayList<>(omProxies.values());
+  }
+}
+
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/package-info.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/package-info.java
similarity index 94%
rename from hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/package-info.java
rename to hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/package-info.java
index df0e69c4d5d..a95f09fa237 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/ha/package-info.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/package-info.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.ozone.client.rpc.ha;
+package org.apache.hadoop.ozone.om.ha;
 
 /**
  * This package contains Ozone Client's OM Proxy classes.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMRatisHelper.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OMRatisHelper.java
similarity index 75%
rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMRatisHelper.java
rename to hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OMRatisHelper.java
index 9115421d8ef..bc64d6c5a1f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OMRatisHelper.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OMRatisHelper.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package org.apache.hadoop.ozone.om.ratis;
+package org.apache.hadoop.ozone.om.helpers;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.conf.Configuration;
@@ -25,13 +25,12 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .OMResponse;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
 import org.apache.ratis.RaftConfigKeys;
 import org.apache.ratis.client.RaftClient;
 import org.apache.ratis.conf.RaftProperties;
 import org.apache.ratis.grpc.GrpcConfigKeys;
 import org.apache.ratis.protocol.Message;
+import org.apache.ratis.protocol.RaftClientReply;
 import org.apache.ratis.protocol.RaftGroup;
 import org.apache.ratis.protocol.RaftPeerId;
 import org.apache.ratis.retry.RetryPolicy;
@@ -53,14 +52,15 @@ public final class OMRatisHelper {
 
   /**
    * Creates a new RaftClient object.
-   * @param rpcType Replication Type
-   * @param omId OM id of the client
-   * @param group RaftGroup
+   *
+   * @param rpcType     Replication Type
+   * @param omId        OM id of the client
+   * @param group       RaftGroup
    * @param retryPolicy Retry policy
    * @return RaftClient object
    */
-  static RaftClient newRaftClient(RpcType rpcType, String omId, RaftGroup
-      group, RetryPolicy retryPolicy,   Configuration conf) {
+  public static RaftClient newRaftClient(RpcType rpcType, String omId, RaftGroup
+      group, RetryPolicy retryPolicy, Configuration conf) {
     LOG.trace("newRaftClient: {}, leader={}, group={}", rpcType, omId, group);
     final RaftProperties properties = new RaftProperties();
     RaftConfigKeys.Rpc.setType(properties, rpcType);
@@ -84,34 +84,27 @@ public final class OMRatisHelper {
     return RaftPeerId.valueOf(omId);
   }
 
-  static ByteString convertRequestToByteString(OMRequest request) {
+  public static ByteString convertRequestToByteString(OMRequest request) {
     byte[] requestBytes = request.toByteArray();
     return ByteString.copyFrom(requestBytes);
   }
 
-  static OMRequest convertByteStringToOMRequest(ByteString byteString)
+  public static OMRequest convertByteStringToOMRequest(ByteString byteString)
       throws InvalidProtocolBufferException {
     byte[] bytes = byteString.toByteArray();
     return OMRequest.parseFrom(bytes);
   }
 
-  static Message convertResponseToMessage(OMResponse response) {
+  public static Message convertResponseToMessage(OMResponse response) {
     byte[] requestBytes = response.toByteArray();
     return Message.valueOf(ByteString.copyFrom(requestBytes));
   }
 
-  static OMResponse convertByteStringToOMResponse(ByteString byteString)
-      throws InvalidProtocolBufferException {
-    byte[] bytes = byteString.toByteArray();
-    return OMResponse.parseFrom(bytes);
-  }
-
-  static OMResponse getErrorResponse(Type cmdType, Exception e) {
-    return OMResponse.newBuilder()
-        .setCmdType(cmdType)
-        .setSuccess(false)
-        .setMessage(e.getMessage())
-        .setStatus(Status.INTERNAL_ERROR)
+  public static OMResponse getOMResponseFromRaftClientReply(
+      RaftClientReply reply) throws InvalidProtocolBufferException {
+    byte[] bytes = reply.getMessage().getContent().toByteArray();
+    return OMResponse.newBuilder(OMResponse.parseFrom(bytes))
+        .setLeaderOMNodeId(reply.getReplierId())
         .build();
   }
-}
+}
\ No newline at end of file
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
index 6834043a909..86fd62490cb 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
@@ -15,7 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.hadoop.ozone.om.protocol;
+
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartCommitUploadPartInfo;
 import org.apache.hadoop.ozone.om.helpers.OmMultipartInfo;
 
@@ -37,6 +41,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OzoneAc
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
+
 import org.apache.hadoop.security.KerberosInfo;
 
 /**
@@ -174,11 +179,13 @@ public interface OzoneManagerProtocol
    *
    * @param args the key to append
    * @param clientID the client identification
+   * @param excludeList List of datanodes/containers to exclude during block
+   *                    allocation
    * @return an allocated block
    * @throws IOException
    */
-  OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID)
-      throws IOException;
+  OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID,
+      ExcludeList excludeList) throws IOException;
 
   /**
    * Look up for the container of an existing key.
@@ -380,5 +387,11 @@ public interface OzoneManagerProtocol
    * @throws IOException
    */
   S3SecretValue getS3Secret(String kerberosID) throws IOException;
+
+  /**
+   * Get the OM Client's Retry and Failover Proxy provider.
+   * @return OMFailoverProxyProvider
+   */
+  OMFailoverProxyProvider getOMFailoverProxyProvider();
 }
 
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index 9136d2b759f..c06efdc2c11 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -17,17 +17,27 @@
  */
 package org.apache.hadoop.ozone.om.protocolPB;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.retry.RetryPolicies;
+import org.apache.hadoop.io.retry.RetryPolicy;
+import org.apache.hadoop.io.retry.RetryProxy;
 import org.apache.hadoop.ipc.ProtobufHelper;
 import org.apache.hadoop.ipc.ProtocolTranslator;
+import org.apache.hadoop.ozone.OzoneConfigKeys;
+import org.apache.hadoop.ozone.om.exceptions.NotLeaderException;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.KeyValueUtil;
 import org.apache.hadoop.ozone.om.helpers.OmBucketArgs;
 import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
@@ -102,6 +112,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeInfo;
 import org.apache.hadoop.ozone.protocolPB.OMPBHelper;
 import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.proto.SecurityProtos.CancelDelegationTokenRequestProto;
 import org.apache.hadoop.security.proto.SecurityProtos.GetDelegationTokenRequestProto;
 import org.apache.hadoop.security.proto.SecurityProtos.RenewDelegationTokenRequestProto;
@@ -111,6 +122,9 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
 import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TOKEN_ERROR_OTHER;
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.ACCESS_DENIED;
@@ -131,19 +145,110 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
    */
   private static final RpcController NULL_RPC_CONTROLLER = null;
 
+  private final OMFailoverProxyProvider omFailoverProxyProvider;
   private final OzoneManagerProtocolPB rpcProxy;
   private final String clientID;
+  private static final Logger FAILOVER_PROXY_PROVIDER_LOG =
+      LoggerFactory.getLogger(OMFailoverProxyProvider.class);
+
+  public OzoneManagerProtocolClientSideTranslatorPB(
+      OzoneManagerProtocolPB proxy, String clientId) {
+    this.rpcProxy = proxy;
+    this.clientID = clientId;
+    this.omFailoverProxyProvider = null;
+  }
 
   /**
-   * Constructor for KeySpaceManger Client.
-   * @param rpcProxy
+   * Constructor for OM Protocol Client. This creates a {@link RetryProxy}
+   * over {@link OMFailoverProxyProvider} proxy. OMFailoverProxyProvider has
+   * one {@link OzoneManagerProtocolPB} proxy pointing to each OM node in the
+   * cluster.
    */
-  public OzoneManagerProtocolClientSideTranslatorPB(
-      OzoneManagerProtocolPB rpcProxy, String clientId) {
-    this.rpcProxy = rpcProxy;
+  public OzoneManagerProtocolClientSideTranslatorPB(OzoneConfiguration conf,
+      String clientId, UserGroupInformation ugi) throws IOException {
+    this.omFailoverProxyProvider = new OMFailoverProxyProvider(conf, ugi);
+
+    int maxRetries = conf.getInt(
+        OzoneConfigKeys.OZONE_CLIENT_RETRY_MAX_ATTEMPTS_KEY,
+        OzoneConfigKeys.OZONE_CLIENT_RETRY_MAX_ATTEMPTS_DEFAULT);
+    int maxFailovers = conf.getInt(
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY,
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_DEFAULT);
+    int sleepBase = conf.getInt(
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_KEY,
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_DEFAULT);
+    int sleepMax = conf.getInt(
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_KEY,
+        OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_DEFAULT);
+
+    this.rpcProxy = TracingUtil.createProxy(
+        createRetryProxy(omFailoverProxyProvider, maxRetries, maxFailovers,
+            sleepBase, sleepMax),
+        OzoneManagerProtocolPB.class);
     this.clientID = clientId;
   }
 
+  /**
+   * Creates a {@link RetryProxy} encapsulating the
+   * {@link OMFailoverProxyProvider}. The retry proxy fails over on network
+   * exception or if the current proxy is not the leader OM.
+   */
+  private OzoneManagerProtocolPB createRetryProxy(
+      OMFailoverProxyProvider failoverProxyProvider,
+      int maxRetries, int maxFailovers, int delayMillis, int maxDelayBase) {
+
+    RetryPolicy retryPolicyOnNetworkException = RetryPolicies
+        .failoverOnNetworkException(RetryPolicies.TRY_ONCE_THEN_FAIL,
+            maxFailovers, maxRetries, delayMillis, maxDelayBase);
+
+    RetryPolicy retryPolicy = new RetryPolicy() {
+      @Override
+      public RetryAction shouldRetry(Exception exception, int retries,
+          int failovers, boolean isIdempotentOrAtMostOnce)
+          throws Exception {
+
+        if (exception instanceof ServiceException) {
+          Throwable cause = exception.getCause();
+          if (cause instanceof NotLeaderException) {
+            NotLeaderException notLeaderException = (NotLeaderException) cause;
+            omFailoverProxyProvider.performFailoverIfRequired(
+                notLeaderException.getSuggestedLeaderNodeId());
+            return getRetryAction(RetryAction.RETRY, retries, failovers);
+          } else {
+            return getRetryAction(RetryAction.FAILOVER_AND_RETRY, retries,
+                failovers);
+          }
+        } else if (exception instanceof EOFException) {
+          return getRetryAction(RetryAction.FAILOVER_AND_RETRY, retries,
+              failovers);
+        } else {
+          return retryPolicyOnNetworkException.shouldRetry(
+              exception, retries, failovers, isIdempotentOrAtMostOnce);
+        }
+      }
+
+      private RetryAction getRetryAction(RetryAction fallbackAction,
+          int retries, int failovers) {
+        if (retries < maxRetries && failovers < maxFailovers) {
+          return fallbackAction;
+        } else {
+          FAILOVER_PROXY_PROVIDER_LOG.error("Failed to connect to OM. " +
+              "Attempted {} retries and {} failovers", retries, failovers);
+          return RetryAction.FAIL;
+        }
+      }
+    };
+
+    OzoneManagerProtocolPB proxy = (OzoneManagerProtocolPB) RetryProxy.create(
+        OzoneManagerProtocolPB.class, failoverProxyProvider, retryPolicy);
+    return proxy;
+  }
+
+  @VisibleForTesting
+  public OMFailoverProxyProvider getOMFailoverProxyProvider() {
+    return omFailoverProxyProvider;
+  }
+
   /**
    * Closes this stream and releases any system resources associated
    * with it. If the stream is already closed then invoking this
@@ -195,7 +300,19 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
       OMRequest payload = OMRequest.newBuilder(omRequest)
           .setTraceID(TracingUtil.exportCurrentSpan())
           .build();
-      return rpcProxy.submitRequest(NULL_RPC_CONTROLLER, payload);
+
+      OMResponse omResponse =
+          rpcProxy.submitRequest(NULL_RPC_CONTROLLER, payload);
+
+      if (omResponse.hasLeaderOMNodeId() && omFailoverProxyProvider != null) {
+        String leaderOmId = omResponse.getLeaderOMNodeId();
+
+        // Failover to the OM node returned by OMReponse leaderOMNodeId if
+        // current proxy is not pointing to that node.
+        omFailoverProxyProvider.performFailoverIfRequired(leaderOmId);
+      }
+
+      return omResponse;
     } catch (ServiceException e) {
       throw ProtobufHelper.getRemoteException(e);
     }
@@ -581,8 +698,8 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
   }
 
   @Override
-  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientId)
-      throws IOException {
+  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientId,
+      ExcludeList excludeList) throws IOException {
     AllocateBlockRequest.Builder req = AllocateBlockRequest.newBuilder();
     KeyArgs keyArgs = KeyArgs.newBuilder()
         .setVolumeName(args.getVolumeName())
@@ -591,6 +708,8 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
         .setDataSize(args.getDataSize()).build();
     req.setKeyArgs(keyArgs);
     req.setClientID(clientId);
+    req.setExcludeList(excludeList.getProtoBuf());
+
 
     OMRequest omRequest = createOMRequest(Type.AllocateBlock)
         .setAllocateBlockRequest(req)
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
index 88b0b9c71a2..330788dcb0a 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/OzoneTokenIdentifier.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMTokenProto;
 import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier;
-import org.apache.hadoop.security.token.Token;
 
 /**
  * The token identifier for Ozone Master.
@@ -68,18 +67,6 @@ public class OzoneTokenIdentifier extends
     return KIND_NAME;
   }
 
-  /**
-   * Default TrivialRenewer.
-   */
-  @InterfaceAudience.Private
-  public static class Renewer extends Token.TrivialRenewer {
-
-    @Override
-    protected Text getKind() {
-      return KIND_NAME;
-    }
-  }
-
   /**
    * Overrides default implementation to write using Protobuf.
    *
diff --git a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
index 9a210e6853f..b1168260c88 100644
--- a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
+++ b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
@@ -140,6 +140,8 @@ message OMResponse {
 
   required Status status = 5;
 
+  optional string leaderOMNodeId = 6;
+
   optional CreateVolumeResponse              createVolumeResponse          = 11;
   optional SetVolumePropertyResponse         setVolumePropertyResponse     = 12;
   optional CheckVolumeAccessResponse         checkVolumeAccessResponse     = 13;
@@ -609,6 +611,7 @@ message CommitKeyResponse {
 message AllocateBlockRequest {
     required KeyArgs keyArgs = 1;
     required uint64 clientID = 2;
+    optional hadoop.hdds.ExcludeListProto excludeList = 3;
 }
 
 message AllocateBlockResponse {
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneBlockTokenSecretManager.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneBlockTokenSecretManager.java
index d71be4df914..ea2d46a66ab 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneBlockTokenSecretManager.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneBlockTokenSecretManager.java
@@ -80,7 +80,7 @@ public class TestOzoneBlockTokenSecretManager {
 
   private CertificateClient getCertificateClient(SecurityConfig secConf)
       throws Exception {
-    return new OMCertificateClient(secConf, "om"){
+    return new OMCertificateClient(secConf){
       @Override
       public X509Certificate getCertificate() {
         return x509Certificate;
diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
index 66151825051..e5888c5b118 100644
--- a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
+++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
@@ -80,7 +80,7 @@ public class TestOzoneDelegationTokenSecretManager {
     X509Certificate cert = KeyStoreTestUtil
         .generateCertificate("CN=OzoneMaster", keyPair, 30, "SHA256withRSA");
 
-    return new OMCertificateClient(securityConfig, "test") {
+    return new OMCertificateClient(securityConfig) {
       @Override
       public X509Certificate getCertificate() {
         return cert;
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
index dc2819b6f83..9a470d54800 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
@@ -110,7 +110,6 @@ run cp "${ROOT}/hadoop-ozone/common/src/main/bin/stop-ozone.sh" "sbin/"
 run mkdir -p "./share/hadoop/ozoneplugin"
 run cp "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore-service-${HDDS_VERSION}-plugin.jar" "./share/hadoop/ozoneplugin/hadoop-ozone-datanode-plugin-${HDDS_VERSION}.jar"
 
-
 # Optional documentation, could be missing
 cp -r "${ROOT}/hadoop-hdds/docs/target/classes/docs" ./
 
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index e66bbbe9098..d9fc915394c 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -103,6 +103,13 @@
                   <classifier>classpath</classifier>
                   <destFileName>hadoop-ozone-datanode.classpath</destFileName>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.hadoop</groupId>
+                  <artifactId>hadoop-ozone-recon</artifactId>
+                  <version>${ozone.version}</version>
+                  <classifier>classpath</classifier>
+                  <destFileName>hadoop-ozone-recon.classpath</destFileName>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -126,7 +133,7 @@
         <executions>
           <execution>
             <id>dist</id>
-            <phase>compile</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>exec</goal>
             </goals>
@@ -204,7 +211,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+      <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
index 08f5c01f694..e44a7bd43d4 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
@@ -36,14 +36,14 @@ services:
          HADOOP_CLASSPATH: /opt/ozone/share/hadoop/ozoneplugin/*.jar
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       volumes:
          - ../..:/opt/hadoop
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
           - ./docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config
index 32931c6b82c..ffce1a5e526 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
-OZONE-SITE.XML_ozone.om.http-address=ozoneManager:9874
+OZONE-SITE.XML_ozone.om.address=om
+OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=true
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
new file mode 100644
index 00000000000..67eed25884f
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+HDDS_VERSION=${hdds.version}
\ No newline at end of file
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
new file mode 100644
index 00000000000..d0e4b6552ac
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
@@ -0,0 +1,82 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "3"
+services:
+   datanode:
+      image: apache/hadoop-runner
+      privileged: true #required by the profiler
+      volumes:
+        - ../..:/opt/hadoop
+      ports:
+        - 9864
+      command: ["/opt/hadoop/bin/ozone","datanode"]
+      env_file:
+        - ./docker-config
+   om1:
+      image: apache/hadoop-runner
+      privileged: true #required by the profiler
+      volumes:
+         - ../..:/opt/hadoop
+      ports:
+         - 9880:9874
+         - 9890:9872
+      environment:
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
+         WAITFOR: scm:9876
+      env_file:
+          - ./docker-config
+      command: ["/opt/hadoop/bin/ozone","om"]
+   om2:
+      image: apache/hadoop-runner
+      privileged: true #required by the profiler
+      volumes:
+         - ../..:/opt/hadoop
+      ports:
+         - 9882:9874
+         - 9892:9872
+      environment:
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
+         WAITFOR: scm:9876
+      env_file:
+         - ./docker-config
+      command: ["/opt/hadoop/bin/ozone","om"]
+   om3:
+      image: apache/hadoop-runner
+      privileged: true #required by the profiler
+      volumes:
+         - ../..:/opt/hadoop
+      ports:
+         - 9884:9874
+         - 9894:9872
+      environment:
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
+         WAITFOR: scm:9876
+      env_file:
+         - ./docker-config
+      command: ["/opt/hadoop/bin/ozone","om"]
+   scm:
+      image: apache/hadoop-runner
+      privileged: true #required by the profiler
+      volumes:
+         - ../..:/opt/hadoop
+      ports:
+         - 9876:9876
+      env_file:
+          - ./docker-config
+      environment:
+          ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+      command: ["/opt/hadoop/bin/ozone","scm"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
new file mode 100644
index 00000000000..f699864a4a0
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
@@ -0,0 +1,81 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+OZONE-SITE.XML_ozone.om.nodes=om1,om2,om3
+OZONE-SITE.XML_ozone.om.address.om1=om1
+OZONE-SITE.XML_ozone.om.address.om2=om2
+OZONE-SITE.XML_ozone.om.address.om3=om3
+OZONE-SITE.XML_ozone.om.ratis.enable=true
+OZONE-SITE.XML_ozone.scm.names=scm
+OZONE-SITE.XML_ozone.enabled=True
+OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
+OZONE-SITE.XML_ozone.scm.block.client.address=scm
+OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
+OZONE-SITE.XML_ozone.handler.type=distributed
+OZONE-SITE.XML_ozone.scm.client.address=scm
+OZONE-SITE.XML_ozone.replication=1
+OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
+OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
+HDFS-SITE.XML_rpc.metrics.quantile.enable=true
+HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
+ASYNC_PROFILER_HOME=/opt/profiler
+LOG4J.PROPERTIES_log4j.rootLogger=INFO, stdout
+LOG4J.PROPERTIES_log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+LOG4J.PROPERTIES_log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+LOG4J.PROPERTIES_log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+LOG4J.PROPERTIES_log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
+LOG4J.PROPERTIES_log4j.logger.org.apache.ratis.conf.ConfUtils=WARN
+LOG4J.PROPERTIES_log4j.logger.org.apache.hadoop.security.ShellBasedUnixGroupsMapping=ERROR
+
+#Enable this variable to print out all hadoop rpc traffic to the stdout. See http://byteman.jboss.org/ to define your own instrumentation.
+#BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm
+
+#LOG4J2.PROPERTIES_* are for Ozone Audit Logging
+LOG4J2.PROPERTIES_monitorInterval=30
+LOG4J2.PROPERTIES_filter=read,write
+LOG4J2.PROPERTIES_filter.read.type=MarkerFilter
+LOG4J2.PROPERTIES_filter.read.marker=READ
+LOG4J2.PROPERTIES_filter.read.onMatch=DENY
+LOG4J2.PROPERTIES_filter.read.onMismatch=NEUTRAL
+LOG4J2.PROPERTIES_filter.write.type=MarkerFilter
+LOG4J2.PROPERTIES_filter.write.marker=WRITE
+LOG4J2.PROPERTIES_filter.write.onMatch=NEUTRAL
+LOG4J2.PROPERTIES_filter.write.onMismatch=NEUTRAL
+LOG4J2.PROPERTIES_appenders=console, rolling
+LOG4J2.PROPERTIES_appender.console.type=Console
+LOG4J2.PROPERTIES_appender.console.name=STDOUT
+LOG4J2.PROPERTIES_appender.console.layout.type=PatternLayout
+LOG4J2.PROPERTIES_appender.console.layout.pattern=%d{DEFAULT} | %-5level | %c{1} | %msg | %throwable{3} %n
+LOG4J2.PROPERTIES_appender.rolling.type=RollingFile
+LOG4J2.PROPERTIES_appender.rolling.name=RollingFile
+LOG4J2.PROPERTIES_appender.rolling.fileName =${sys:hadoop.log.dir}/om-audit-${hostName}.log
+LOG4J2.PROPERTIES_appender.rolling.filePattern=${sys:hadoop.log.dir}/om-audit-${hostName}-%d{yyyy-MM-dd-HH-mm-ss}-%i.log.gz
+LOG4J2.PROPERTIES_appender.rolling.layout.type=PatternLayout
+LOG4J2.PROPERTIES_appender.rolling.layout.pattern=%d{DEFAULT} | %-5level | %c{1} | %msg | %throwable{3} %n
+LOG4J2.PROPERTIES_appender.rolling.policies.type=Policies
+LOG4J2.PROPERTIES_appender.rolling.policies.time.type=TimeBasedTriggeringPolicy
+LOG4J2.PROPERTIES_appender.rolling.policies.time.interval=86400
+LOG4J2.PROPERTIES_appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+LOG4J2.PROPERTIES_appender.rolling.policies.size.size=64MB
+LOG4J2.PROPERTIES_loggers=audit
+LOG4J2.PROPERTIES_logger.audit.type=AsyncLogger
+LOG4J2.PROPERTIES_logger.audit.name=OMAudit
+LOG4J2.PROPERTIES_logger.audit.level=INFO
+LOG4J2.PROPERTIES_logger.audit.appenderRefs=rolling
+LOG4J2.PROPERTIES_logger.audit.appenderRef.file.ref=RollingFile
+LOG4J2.PROPERTIES_rootLogger.level=INFO
+LOG4J2.PROPERTIES_rootLogger.appenderRefs=stdout
+LOG4J2.PROPERTIES_rootLogger.appenderRef.stdout.ref=STDOUT
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index 487c4eb29b1..fa3ba7b703b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -23,10 +23,11 @@ services:
         - ../..:/opt/hadoop
       ports:
         - 9864
+        - 9882
       command: ["/opt/hadoop/bin/ozone","datanode"]
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       privileged: true #required by the profiler
       volumes:
@@ -34,7 +35,7 @@ services:
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
           - ./docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
index c55ebe14675..6ba54b120ca 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
-OZONE-SITE.XML_ozone.om.http-address=ozoneManager:9874
+OZONE-SITE.XML_ozone.om.address=om
+OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=True
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
index 75f4bf03901..8a242555533 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
@@ -25,14 +25,14 @@ services:
       command: ["/opt/hadoop/bin/ozone","datanode"]
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       volumes:
          - ../..:/opt/hadoop
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
       env_file:
           - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
index 506340cf020..2c87eb9867c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
-OZONE-SITE.XML_ozone.om.http-address=ozoneManager:9874
+OZONE-SITE.XML_ozone.om.address=om
+OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=True
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
index 22055fce5b1..5d54ecf31ab 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
@@ -25,15 +25,15 @@ services:
       command: ["/opt/hadoop/bin/ozone","datanode"]
       env_file:
          - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
-      hostname: ozoneManager
+      hostname: om
       volumes:
          - ../..:/opt/hadoop
       ports:
          - 9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
          - ./docker-config
@@ -56,7 +56,7 @@ services:
       env_file:
          - ./docker-config
       environment:
-         HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-0*.jar
+         HADOOP_CLASSPATH: /opt/ozone/share/ozone/lib/hadoop-ozone-filesystem-lib-current*.jar
       command: ["watch","-n","100000","ls"]
    hadoop2:
       image: flokkr/hadoop:2.9.0
diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config
index 5061afaf832..edfaa0ff138 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
-OZONE-SITE.XML_ozone.om.address=ozoneManager
-OZONE-SITE.XML_ozone.om.http-address=ozoneManager:9874
+OZONE-SITE.XML_ozone.om.address=om
+OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=True
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
index 9277c8d90cd..4f5230b66df 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
@@ -25,14 +25,14 @@ services:
       command: ["ozone","datanode"]
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       volumes:
         - ../..:/opt/hadoop
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
           - ./docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
index 3e100680ed6..9c55363e562 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
-OZONE-SITE.XML_ozone.om.http-address=ozoneManager:9874
+OZONE-SITE.XML_ozone.om.address=om
+OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=true
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
index 054607cceae..343b5d7c8df 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
@@ -25,14 +25,14 @@ services:
       command: ["ozone","datanode"]
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       volumes:
          - ../..:/opt/hadoop
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
           - ./docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
index 2943d199b55..ca0d557cfb2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
+OZONE-SITE.XML_ozone.om.address=om
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=true
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
index b102c5aeb53..c0057276981 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -44,7 +44,7 @@ services:
     command: ["/opt/hadoop/bin/ozone","datanode"]
     env_file:
       - docker-config
-  ozoneManager:
+  om:
     image: apache/hadoop-runner
     hostname: om
     volumes:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 4447a81900a..5031e6cbd67 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -104,7 +104,7 @@ LOG4J2.PROPERTIES_rootLogger.appenderRef.stdout.ref=STDOUT
 
 OZONE_DATANODE_SECURE_USER=root
 KEYTAB_DIR=/etc/security/keytabs
-KERBEROS_KEYTABS=dn om scm HTTP testuser
+KERBEROS_KEYTABS=dn om scm HTTP testuser s3g
 KERBEROS_KEYSTORES=hadoop
 KERBEROS_SERVER=kdc
 JAVA_HOME=/usr/lib/jvm/jre
diff --git a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
index 5fadd72223b..3eb656ed52e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
@@ -31,14 +31,14 @@ services:
       command: ["ozone","datanode"]
       env_file:
         - ./docker-config
-   ozoneManager:
+   om:
       image: apache/hadoop-runner
       volumes:
          - ../..:/opt/hadoop
       ports:
          - 9874:9874
       environment:
-         ENSURE_OM_INITIALIZED: /data/metadata/ozoneManager/current/VERSION
+         ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
          WAITFOR: scm:9876
       env_file:
           - ./docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config
index 39a55dcf6b1..ce88a38e3e4 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OZONE-SITE.XML_ozone.om.address=ozoneManager
+OZONE-SITE.XML_ozone.om.address=om
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=true
 OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot b/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
index dde67a9625e..88af0976270 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
@@ -27,7 +27,7 @@ ${DATANODE_HOST}        datanode
 Check webui static resources
     ${result} =        Execute                curl -s -I http://scm:9876/static/bootstrap-3.3.7/js/bootstrap.min.js
                        Should contain         ${result}    200
-    ${result} =        Execute                curl -s -I http://ozoneManager:9874/static/bootstrap-3.3.7/js/bootstrap.min.js
+    ${result} =        Execute                curl -s -I http://om:9874/static/bootstrap-3.3.7/js/bootstrap.min.js
                        Should contain         ${result}    200
 
 Start freon testing
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
index 2b5d66ef143..b66e9f8e91b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
@@ -23,7 +23,7 @@ Test Timeout        2 minute
 
 *** Test Cases ***
 RpcClient with port
-   Test ozone shell       o3://            ozoneManager:9862     rpcwoport
+   Test ozone shell       o3://            om:9862     rpcwoport
 
 RpcClient without host
    Test ozone shell       o3://            ${EMPTY}              rpcwport
diff --git a/hadoop-ozone/dist/src/main/smoketest/commonlib.robot b/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
index eb3a8bb547b..7f8cd4b6b65 100644
--- a/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
@@ -28,4 +28,10 @@ Execute and checkrc
     ${rc}                           ${output} =                 Run And Return Rc And Output           ${command}
     Log                             ${output}
     Should Be Equal As Integers     ${rc}                       ${expected_error_code}
-    [return]                        ${output}
\ No newline at end of file
+    [return]                        ${output}
+
+Compare files
+    [arguments]                 ${file1}                   ${file2}
+    ${checksumbefore} =         Execute                    md5sum ${file1} | awk '{print $1}'
+    ${checksumafter} =          Execute                    md5sum ${file2} | awk '{print $1}'
+                                Should Be Equal            ${checksumbefore}            ${checksumafter}
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
index afd37c5e1d2..23ef96c989a 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/ozonefs.robot
@@ -23,25 +23,25 @@ Resource            ../commonlib.robot
 
 *** Test Cases ***
 Create volume and bucket
-    Execute             ozone sh volume create http://ozoneManager/fstest --user bilbo --quota 100TB --root
-    Execute             ozone sh volume create http://ozoneManager/fstest2 --user bilbo --quota 100TB --root
-    Execute             ozone sh bucket create http://ozoneManager/fstest/bucket1
-    Execute             ozone sh bucket create http://ozoneManager/fstest/bucket2
-    Execute             ozone sh bucket create http://ozoneManager/fstest2/bucket3
+    Execute             ozone sh volume create http://om/fstest --user bilbo --quota 100TB --root
+    Execute             ozone sh volume create http://om/fstest2 --user bilbo --quota 100TB --root
+    Execute             ozone sh bucket create http://om/fstest/bucket1
+    Execute             ozone sh bucket create http://om/fstest/bucket2
+    Execute             ozone sh bucket create http://om/fstest2/bucket3
 
 Check volume from ozonefs
     ${result} =         Execute               ozone fs -ls o3fs://bucket1.fstest/
 
 Run ozoneFS tests
                         Execute               ozone fs -mkdir -p o3fs://bucket1.fstest/testdir/deep
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain    ${result}         testdir/deep
                         Execute               ozone fs -copyFromLocal NOTICE.txt o3fs://bucket1.fstest/testdir/deep/
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain    ${result}         NOTICE.txt
 
                         Execute               ozone fs -put NOTICE.txt o3fs://bucket1.fstest/testdir/deep/PUTFILE.txt
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain    ${result}         PUTFILE.txt
 
     ${result} =         Execute               ozone fs -ls o3fs://bucket1.fstest/testdir/deep/
@@ -49,13 +49,13 @@ Run ozoneFS tests
                         Should contain    ${result}         PUTFILE.txt
 
                         Execute               ozone fs -mv o3fs://bucket1.fstest/testdir/deep/NOTICE.txt o3fs://bucket1.fstest/testdir/deep/MOVED.TXT
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain    ${result}         MOVED.TXT
                         Should not contain  ${result}       NOTICE.txt
 
                         Execute               ozone fs -mkdir -p o3fs://bucket1.fstest/testdir/deep/subdir1
                         Execute               ozone fs -cp o3fs://bucket1.fstest/testdir/deep/MOVED.TXT o3fs://bucket1.fstest/testdir/deep/subdir1/NOTICE.txt
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain    ${result}         subdir1/NOTICE.txt
 
     ${result} =         Execute               ozone fs -ls o3fs://bucket1.fstest/testdir/deep/subdir1/
@@ -65,19 +65,19 @@ Run ozoneFS tests
                         Should not contain  ${result}       Failed
 
                         Execute               ozone fs -rm o3fs://bucket1.fstest/testdir/deep/subdir1/NOTICE.txt
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should not contain  ${result}       NOTICE.txt
 
     ${result} =         Execute               ozone fs -rmdir o3fs://bucket1.fstest/testdir/deep/subdir1/
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should not contain  ${result}       subdir1
 
                         Execute               ozone fs -touch o3fs://bucket1.fstest/testdir/TOUCHFILE.txt
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should contain  ${result}       TOUCHFILE.txt
 
                         Execute               ozone fs -rm -r o3fs://bucket1.fstest/testdir/
-    ${result} =         Execute               ozone sh key list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute               ozone sh key list o3://om/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                         Should not contain  ${result}       testdir
 
                         Execute               rm -Rf localdir1
@@ -98,7 +98,7 @@ Run ozoneFS tests
 
                         Execute               ozone fs -cp o3fs://bucket1.fstest/testdir1/localdir1 o3fs://bucket3.fstest2/testdir3/
 
-                        Execute               ozone sh key put o3://ozoneManager/fstest/bucket1/KEY.txt NOTICE.txt
+                        Execute               ozone sh key put o3://om/fstest/bucket1/KEY.txt NOTICE.txt
     ${result} =         Execute               ozone fs -ls o3fs://bucket1.fstest/KEY.txt
                         Should contain    ${result}         KEY.txt
     ${rc}  ${result} =  Run And Return Rc And Output        ozone fs -copyFromLocal NOTICE.txt o3fs://bucket1.fstest/KEY.txt
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot b/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot
index 1f69c9e93ff..0133d50ff1f 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot
@@ -22,11 +22,9 @@ Resource            commonawslib.robot
 Test Setup          Setup s3 tests
 
 *** Keywords ***
-Create Random file for mac
-    Execute                 dd if=/dev/urandom of=/tmp/part1 bs=1m count=5
-
-Create Random file for linux
-    Execute                 dd if=/dev/urandom of=/tmp/part1 bs=1M count=5
+Create Random file
+    [arguments]             ${size_in_megabytes}
+    Execute                 dd if=/dev/urandom of=/tmp/part1 bs=1048576 count=${size_in_megabytes}
 
 
 *** Variables ***
@@ -54,16 +52,13 @@ Test Multipart Upload
 # upload we get error entity too small. So, considering further complete
 # multipart upload, uploading each part as 5MB file, exception is for last part
 
-	${system} =         Evaluate    platform.system()    platform
-	Run Keyword if      '${system}' == 'Darwin'  Create Random file for mac
-	Run Keyword if      '${system}' == 'Linux'   Create Random file for linux
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/part1 --upload-id ${nextUploadID}
-	                    Should contain          ${result}    ETag
+    Run Keyword         Create Random file      5
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/part1 --upload-id ${nextUploadID}
+                        Should contain          ${result}    ETag
 # override part
-	Run Keyword if      '${system}' == 'Darwin'    Create Random file for mac
-	Run Keyword if      '${system}' == 'Linux'     Create Random file for linux
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/part1 --upload-id ${nextUploadID}
-	                    Should contain          ${result}    ETag
+    Run Keyword         Create Random file      5
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/part1 --upload-id ${nextUploadID}
+                        Should contain          ${result}    ETag
 
 
 Test Multipart Upload Complete
@@ -74,17 +69,15 @@ Test Multipart Upload Complete
                         Should contain          ${result}    UploadId
 
 #upload parts
-	${system} =         Evaluate    platform.system()    platform
-	Run Keyword if      '${system}' == 'Darwin'  Create Random file for mac
-	Run Keyword if      '${system}' == 'Linux'   Create Random file for linux
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey1 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
-	${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    Run Keyword         Create Random file      5
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey1 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
+    ${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
                         Execute                 echo "Part2" > /tmp/part2
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey1 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
-	${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey1 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
+    ${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
 #complete multipart upload
     ${result} =         Execute AWSS3APICli     complete-multipart-upload --upload-id ${uploadID} --bucket ${BUCKET} --key multipartKey1 --multipart-upload 'Parts=[{ETag=${eTag1},PartNumber=1},{ETag=${eTag2},PartNumber=2}]'
@@ -94,11 +87,8 @@ Test Multipart Upload Complete
 
 #read file and check the key
     ${result} =                 Execute AWSS3ApiCli        get-object --bucket ${BUCKET} --key multipartKey1 /tmp/multipartKey1.result
-                                Execute                    cat /tmp/part1 /tmp/part2 >> /tmp/multipartkey1
-    ${checksumbefore} =         Execute                    md5sum /tmp/multipartkey1 | awk '{print $1}'
-    ${checksumafter} =          Execute                    md5sum /tmp/multipartKey1.result | awk '{print $1}'
-                                Should Be Equal            ${checksumbefore}            ${checksumafter}
-
+                                Execute                    cat /tmp/part1 /tmp/part2 >> /tmp/multipartKey1
+    Compare files               /tmp/multipartKey1         /tmp/multipartKey1.result
 
 Test Multipart Upload Complete Entity too small
     ${result} =         Execute AWSS3APICli     create-multipart-upload --bucket ${BUCKET} --key multipartKey2
@@ -109,14 +99,14 @@ Test Multipart Upload Complete Entity too small
 
 #upload parts
                         Execute                 echo "Part1" > /tmp/part1
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey2 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
-	${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey2 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
+    ${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
                         Execute                 echo "Part2" > /tmp/part2
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey2 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
-	${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey2 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
+    ${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
 #complete multipart upload
     ${result} =         Execute AWSS3APICli and checkrc  complete-multipart-upload --upload-id ${uploadID} --bucket ${BUCKET} --key multipartKey2 --multipart-upload 'Parts=[{ETag=${eTag1},PartNumber=1},{ETag=${eTag2},PartNumber=2}]'    255
@@ -132,14 +122,14 @@ Test Multipart Upload Complete Invalid part
 
 #upload parts
                         Execute                 echo "Part1" > /tmp/part1
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey3 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
-	${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey3 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
+    ${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
                         Execute                 echo "Part2" > /tmp/part2
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey3 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
-	${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey3 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
+    ${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
 #complete multipart upload
     ${result} =         Execute AWSS3APICli and checkrc  complete-multipart-upload --upload-id ${uploadID} --bucket ${BUCKET} --key multipartKey3 --multipart-upload 'Parts=[{ETag=etag1,PartNumber=1},{ETag=etag2,PartNumber=2}]'    255
@@ -158,9 +148,9 @@ Test abort Multipart upload with invalid uploadId
     ${result} =         Execute AWSS3APICli and checkrc    abort-multipart-upload --bucket ${BUCKET} --key multipartKey5 --upload-id "random"    255
 
 Upload part with Incorrect uploadID
-	                    Execute                 echo "Multipart upload" > /tmp/testfile
-	    ${result} =     Execute AWSS3APICli and checkrc     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/testfile --upload-id "random"  255
-	                    Should contain          ${result}    NoSuchUpload
+                        Execute                 echo "Multipart upload" > /tmp/testfile
+        ${result} =     Execute AWSS3APICli and checkrc     upload-part --bucket ${BUCKET} --key multipartKey --part-number 1 --body /tmp/testfile --upload-id "random"  255
+                        Should contain          ${result}    NoSuchUpload
 
 Test list parts
 #initiate multipart upload
@@ -171,37 +161,42 @@ Test list parts
                         Should contain          ${result}    UploadId
 
 #upload parts
-	${system} =         Evaluate    platform.system()    platform
-	Run Keyword if      '${system}' == 'Darwin'  Create Random file for mac
-	Run Keyword if      '${system}' == 'Linux'   Create Random file for linux
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey5 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
-	${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+    Run Keyword         Create Random file      5
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey5 --part-number 1 --body /tmp/part1 --upload-id ${uploadID}
+    ${eTag1} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
-                      Execute                 echo "Part2" > /tmp/part2
-	${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey5 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
-	${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
-	                    Should contain          ${result}    ETag
+                        Execute                 echo "Part2" > /tmp/part2
+    ${result} =         Execute AWSS3APICli     upload-part --bucket ${BUCKET} --key multipartKey5 --part-number 2 --body /tmp/part2 --upload-id ${uploadID}
+    ${eTag2} =          Execute and checkrc     echo '${result}' | jq -r '.ETag'   0
+                        Should contain          ${result}    ETag
 
 #list parts
-	${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID}
-	${part1} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
-	${part2} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[1].ETag'  0
-                      Should Be equal       ${part1}    ${eTag1}
-                      Should contain        ${part2}    ${eTag2}
-                      Should contain        ${result}    STANDARD
+    ${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID}
+    ${part1} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
+    ${part2} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[1].ETag'  0
+                        Should Be equal       ${part1}    ${eTag1}
+                        Should contain        ${part2}    ${eTag2}
+                        Should contain        ${result}    STANDARD
 
 #list parts with max-items and next token
-	${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID} --max-items 1
-	${part1} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
-	${token} =          Execute and checkrc    echo '${result}' | jq -r '.NextToken'  0
-                      Should Be equal       ${part1}    ${eTag1}
-                      Should contain        ${result}   STANDARD
+    ${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID} --max-items 1
+    ${part1} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
+    ${token} =          Execute and checkrc    echo '${result}' | jq -r '.NextToken'  0
+                        Should Be equal       ${part1}    ${eTag1}
+                        Should contain        ${result}   STANDARD
 
-	${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID} --max-items 1 --starting-token ${token}
-	${part2} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
-                      Should Be equal       ${part2}    ${eTag2}
-                      Should contain        ${result}   STANDARD
+    ${result} =         Execute AWSS3APICli   list-parts --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID} --max-items 1 --starting-token ${token}
+    ${part2} =          Execute and checkrc    echo '${result}' | jq -r '.Parts[0].ETag'  0
+                       Should Be equal       ${part2}    ${eTag2}
+                       Should contain        ${result}   STANDARD
 
 #finally abort it
-  ${result} =         Execute AWSS3APICli and checkrc    abort-multipart-upload --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID}    0
+    ${result} =         Execute AWSS3APICli and checkrc    abort-multipart-upload --bucket ${BUCKET} --key multipartKey5 --upload-id ${uploadID}    0
+
+Test Multipart Upload with the simplified aws s3 cp API
+                        Create Random file      22
+                        Execute AWSS3Cli        cp /tmp/part1 s3://${BUCKET}/mpyawscli
+                        Execute AWSS3Cli        cp s3://${BUCKET}/mpyawscli /tmp/part1.result
+                        Execute AWSS3Cli        rm s3://${BUCKET}/mpyawscli
+                        Compare files           /tmp/part1        /tmp/part1.result
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot b/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
index e42ffaf9384..1b2a5048efe 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
@@ -42,9 +42,7 @@ Put object to s3
 #This test depends on the previous test case. Can't be executes alone
 Get object from s3
     ${result} =                 Execute AWSS3ApiCli        get-object --bucket ${BUCKET} --key putobject/f1 /tmp/testfile.result
-    ${checksumbefore} =         Execute                    md5sum /tmp/testfile | awk '{print $1}'
-    ${checksumafter} =          Execute                    md5sum /tmp/testfile.result | awk '{print $1}'
-                                Should Be Equal            ${checksumbefore}            ${checksumafter}
+    Compare files               /tmp/testfile              /tmp/testfile.result
 
 Get Partial object from s3 with both start and endoffset
     ${result} =                 Execute AWSS3ApiCli        get-object --bucket ${BUCKET} --key putobject/f1 --range bytes=0-4 /tmp/testfile1.result
diff --git a/hadoop-ozone/dist/src/main/smoketest/test.sh b/hadoop-ozone/dist/src/main/smoketest/test.sh
index 621d56aab19..582fbdf7c52 100755
--- a/hadoop-ozone/dist/src/main/smoketest/test.sh
+++ b/hadoop-ozone/dist/src/main/smoketest/test.sh
@@ -45,7 +45,7 @@ wait_for_datanodes(){
 
          #Print it only if a number. Could be not a number if scm is not yet started
          if [[ "$datanodes" ]]; then
-            echo "$datanodes datanode is up and healhty (until now)"
+            echo "$datanodes datanode is up and healthy (until now)"
          fi
       fi
 
@@ -78,7 +78,7 @@ execute_tests(){
      TITLE="Ozone $TEST tests with $COMPOSE_DIR cluster"
      set +e
      OUTPUT_NAME="$COMPOSE_DIR-${TEST//\//_}"
-	  docker-compose -f "$COMPOSE_FILE" exec -T ozoneManager python -m robot --log NONE --report NONE "${OZONE_ROBOT_OPTS[@]}" --output "smoketest/$RESULT_DIR/robot-$OUTPUT_NAME.xml" --logtitle "$TITLE" --reporttitle "$TITLE" "smoketest/$TEST"
+	  docker-compose -f "$COMPOSE_FILE" exec -T om python -m robot --log NONE --report NONE "${OZONE_ROBOT_OPTS[@]}" --output "smoketest/$RESULT_DIR/robot-$OUTPUT_NAME.xml" --logtitle "$TITLE" --reporttitle "$TITLE" "smoketest/$TEST"
      set -e
      docker-compose -f "$COMPOSE_FILE" logs > "$DIR/$RESULT_DIR/docker-$OUTPUT_NAME.log"
   done
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 04f131b0744..5cc6c9eb62c 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -52,6 +52,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-ozone-s3gateway</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-ozone-recon</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-ozone-client</artifactId>
@@ -93,5 +97,29 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-container-service</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 </project>
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
index 6f385de1d7e..28f47cc80f9 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineProvider.java
@@ -46,7 +46,7 @@ public class TestRatisPipelineProvider {
   public void init() throws Exception {
     nodeManager = new MockNodeManager(true, 10);
     stateManager = new PipelineStateManager(new OzoneConfiguration());
-    provider = new RatisPipelineProvider(nodeManager,
+    provider = new MockRatisPipelineProvider(nodeManager,
         stateManager, new OzoneConfiguration());
   }
 
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineUtils.java
index e56b8888421..2180834cd4f 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestRatisPipelineUtils.java
@@ -20,12 +20,16 @@ package org.apache.hadoop.hdds.scm.pipeline;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
+import org.apache.hadoop.io.MultipleIOException;
 import org.apache.hadoop.ozone.HddsDatanodeService;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -81,12 +85,29 @@ public class TestRatisPipelineUtils {
     init(3);
     // make sure a pipelines is created
     waitForPipelines(1);
-    for (HddsDatanodeService dn : cluster.getHddsDatanodes()) {
+    List<HddsDatanodeService> dns = new ArrayList<>(cluster.getHddsDatanodes());
+
+    List<Pipeline> pipelines =
+        pipelineManager.getPipelines(HddsProtos.ReplicationType.RATIS,
+            HddsProtos.ReplicationFactor.THREE);
+    for (HddsDatanodeService dn : dns) {
       cluster.shutdownHddsDatanode(dn.getDatanodeDetails());
     }
+
+    // try creating another pipeline now
+    try {
+      RatisPipelineUtils.createPipeline(pipelines.get(0), conf);
+      Assert.fail("pipeline creation should fail after shutting down pipeline");
+    } catch (IOException ioe) {
+      // in case the pipeline creation fails, MultipleIOException is thrown
+      Assert.assertTrue(ioe instanceof MultipleIOException);
+    }
+
     // make sure pipelines is destroyed
     waitForPipelines(0);
-    cluster.startHddsDatanodes();
+    for (HddsDatanodeService dn : dns) {
+      cluster.restartHddsDatanode(dn.getDatanodeDetails(), false);
+    }
     // make sure pipelines is created after node start
     waitForPipelines(1);
   }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
index c871a565eee..4d8e3af656d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
@@ -71,8 +71,13 @@ public class TestSCMPipelineManager {
 
   @Test
   public void testPipelineReload() throws IOException {
-    PipelineManager pipelineManager =
+    SCMPipelineManager pipelineManager =
         new SCMPipelineManager(conf, nodeManager, new EventQueue());
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager,
+            pipelineManager.getStateManager(), conf);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
     Set<Pipeline> pipelines = new HashSet<>();
     for (int i = 0; i < 5; i++) {
       Pipeline pipeline = pipelineManager
@@ -85,6 +90,11 @@ public class TestSCMPipelineManager {
     // new pipeline manager should be able to load the pipelines from the db
     pipelineManager =
         new SCMPipelineManager(conf, nodeManager, new EventQueue());
+    mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager,
+            pipelineManager.getStateManager(), conf);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
     for (Pipeline p : pipelines) {
       pipelineManager.openPipeline(p.getId());
     }
@@ -102,8 +112,14 @@ public class TestSCMPipelineManager {
 
   @Test
   public void testRemovePipeline() throws IOException {
-    PipelineManager pipelineManager =
+    SCMPipelineManager pipelineManager =
         new SCMPipelineManager(conf, nodeManager, new EventQueue());
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager,
+            pipelineManager.getStateManager(), conf);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
+
     Pipeline pipeline = pipelineManager
         .createPipeline(HddsProtos.ReplicationType.RATIS,
             HddsProtos.ReplicationFactor.THREE);
@@ -134,8 +150,14 @@ public class TestSCMPipelineManager {
   @Test
   public void testPipelineReport() throws IOException {
     EventQueue eventQueue = new EventQueue();
-    PipelineManager pipelineManager =
+    SCMPipelineManager pipelineManager =
         new SCMPipelineManager(conf, nodeManager, eventQueue);
+    PipelineProvider mockRatisProvider =
+        new MockRatisPipelineProvider(nodeManager,
+            pipelineManager.getStateManager(), conf);
+    pipelineManager.setPipelineProvider(HddsProtos.ReplicationType.RATIS,
+        mockRatisProvider);
+
     SCMChillModeManager scmChillModeManager =
         new SCMChillModeManager(new OzoneConfiguration(),
             new ArrayList<>(), pipelineManager, eventQueue);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index cc48116a5c3..dbeb0b56e2e 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -392,7 +392,9 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
         scm = createSCM();
         scm.start();
         om = createOM();
-        om.setCertClient(certClient);
+        if(certClient != null) {
+          om.setCertClient(certClient);
+        }
       } catch (AuthenticationException ex) {
         throw new IOException("Unable to build MiniOzoneCluster. ", ex);
       }
@@ -476,6 +478,10 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
       omStorage.setClusterId(clusterId);
       omStorage.setScmId(scmId.get());
       omStorage.setOmId(omId.orElse(UUID.randomUUID().toString()));
+      // Initialize ozone certificate client if security is enabled.
+      if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+        OzoneManager.initializeSecurity(conf, omStorage);
+      }
       omStorage.initialize();
     }
 
@@ -571,6 +577,7 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
 
     private void configureHddsDatanodes() {
       conf.set(ScmConfigKeys.HDDS_REST_HTTP_ADDRESS_KEY, "0.0.0.0:0");
+      conf.set(HddsConfigKeys.HDDS_DATANODE_HTTP_ADDRESS_KEY, "0.0.0.0:0");
       conf.set(HDDS_DATANODE_PLUGINS_KEY,
           "org.apache.hadoop.ozone.web.OzoneHddsDatanodeService");
       conf.setBoolean(OzoneConfigKeys.DFS_CONTAINER_IPC_RANDOM_PORT,
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index a1ef1f6424a..f84f95ea8e7 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -32,7 +32,9 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.net.BindException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -48,6 +50,7 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
   private static final Logger LOG =
       LoggerFactory.getLogger(MiniOzoneHAClusterImpl.class);
 
+  private Map<String, OzoneManager> ozoneManagerMap;
   private List<OzoneManager> ozoneManagers;
 
   private static final Random RANDOM = new Random();
@@ -63,11 +66,12 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
 
   private MiniOzoneHAClusterImpl(
       OzoneConfiguration conf,
-      List<OzoneManager> omList,
+      Map<String, OzoneManager> omMap,
       StorageContainerManager scm,
       List<HddsDatanodeService> hddsDatanodes) {
     super(conf, scm, hddsDatanodes);
-    this.ozoneManagers = omList;
+    this.ozoneManagerMap = omMap;
+    this.ozoneManagers = new ArrayList<>(omMap.values());
   }
 
   /**
@@ -107,6 +111,10 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
     ozoneManagers.get(index).stop();
   }
 
+  public void stopOzoneManager(String omNodeId) {
+    ozoneManagerMap.get(omNodeId).stop();
+  }
+
   /**
    * Builder for configuring the MiniOzoneCluster to run.
    */
@@ -128,17 +136,17 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
       DefaultMetricsSystem.setMiniClusterMode(true);
       initializeConfiguration();
       StorageContainerManager scm;
-      List<OzoneManager> omList;
+      Map<String, OzoneManager> omMap;
       try {
         scm = createSCM();
         scm.start();
-        omList = createOMService();
+        omMap = createOMService();
       } catch (AuthenticationException ex) {
         throw new IOException("Unable to build MiniOzoneCluster. ", ex);
       }
 
       final List<HddsDatanodeService> hddsDatanodes = createHddsDatanodes(scm);
-      MiniOzoneHAClusterImpl cluster = new MiniOzoneHAClusterImpl(conf, omList,
+      MiniOzoneHAClusterImpl cluster = new MiniOzoneHAClusterImpl(conf, omMap,
           scm, hddsDatanodes);
       if (startDataNodes) {
         cluster.startHddsDatanodes();
@@ -171,10 +179,10 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
      * @throws IOException
      * @throws AuthenticationException
      */
-    private List<OzoneManager> createOMService() throws IOException,
+    private Map<String, OzoneManager> createOMService() throws IOException,
         AuthenticationException {
 
-      List<OzoneManager> omList = new ArrayList<>(numOfOMs);
+      Map<String, OzoneManager> omMap = new HashMap<>();
 
       int retryCount = 0;
       int basePort = 10000;
@@ -186,10 +194,11 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
 
           for (int i = 1; i<= numOfOMs; i++) {
             // Set nodeId
-            conf.set(OMConfigKeys.OZONE_OM_NODE_ID_KEY, nodeIdBaseStr + i);
+            String nodeId = nodeIdBaseStr + i;
+            conf.set(OMConfigKeys.OZONE_OM_NODE_ID_KEY, nodeId);
 
             // Set metadata/DB dir base path
-            String metaDirPath = path + "/" + nodeIdBaseStr + i;
+            String metaDirPath = path + "/" + nodeId;
             conf.set(OZONE_METADATA_DIRS, metaDirPath);
             OMStorage omStore = new OMStorage(conf);
             initializeOmStorage(omStore);
@@ -201,7 +210,7 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
 
             OzoneManager om = OzoneManager.createOm(null, conf);
             om.setCertClient(certClient);
-            omList.add(om);
+            omMap.put(nodeId, om);
 
             om.start();
             LOG.info("Started OzoneManager RPC server at " +
@@ -211,23 +220,24 @@ public final class MiniOzoneHAClusterImpl extends MiniOzoneClusterImpl {
           // Set default OM address to point to the first OM. Clients would
           // try connecting to this address by default
           conf.set(OMConfigKeys.OZONE_OM_ADDRESS_KEY,
-              NetUtils.getHostPortString(omList.get(0).getOmRpcServerAddr()));
+              NetUtils.getHostPortString(omMap.get(nodeIdBaseStr + 1)
+                  .getOmRpcServerAddr()));
 
           break;
         } catch (BindException e) {
-          for (OzoneManager om : omList) {
+          for (OzoneManager om : omMap.values()) {
             om.stop();
             om.join();
             LOG.info("Stopping OzoneManager server at " +
                 om.getOmRpcServerAddr());
           }
-          omList.clear();
+          omMap.clear();
           ++retryCount;
           LOG.info("MiniOzoneHACluster port conflicts, retried " +
               retryCount + " times");
         }
       }
-      return omList;
+      return omMap;
     }
 
     /**
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index 30f074925c7..fa14f472b8d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.conf.TestConfigurationFieldsBase;
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.ozone.recon.ReconServerConfigKeys;
 import org.apache.hadoop.ozone.s3.S3GatewayConfigKeys;
 
 /**
@@ -34,6 +35,7 @@ public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase {
     configurationClasses =
         new Class[] {OzoneConfigKeys.class, ScmConfigKeys.class,
             OMConfigKeys.class, HddsConfigKeys.class,
+            ReconServerConfigKeys.class,
             S3GatewayConfigKeys.class};
     errorIfMissingConfigProps = true;
     errorIfMissingXmlProps = true;
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
index 3ad11d5b22d..c4deeba958d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
@@ -27,7 +27,6 @@ import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TOKE
 import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TOKEN_EXPIRED;
 import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
 import static org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
-import org.junit.Ignore;
 import static org.slf4j.event.Level.INFO;
 
 import java.io.File;
@@ -53,7 +52,6 @@ import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
 import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
 import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
-import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
 import org.apache.hadoop.hdds.security.x509.keys.HDDSKeyGenerator;
 import org.apache.hadoop.hdds.security.x509.keys.KeyCodec;
 import org.apache.hadoop.io.Text;
@@ -65,6 +63,7 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.ozone.client.CertificateClientTestImpl;
+import org.apache.hadoop.ozone.common.Storage;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.OMStorage;
 import org.apache.hadoop.ozone.om.OzoneManager;
@@ -80,6 +79,10 @@ import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.GenericTestUtils.LogCapturer;
 import org.apache.hadoop.test.LambdaTestUtils;
+import org.bouncycastle.asn1.x500.RDN;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x500.style.BCStyle;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -90,6 +93,12 @@ import org.junit.rules.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.cert.X509Certificate;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+
 
 /**
  * Test class to for security enabled Ozone cluster.
@@ -97,7 +106,7 @@ import org.slf4j.LoggerFactory;
 @InterfaceAudience.Private
 public final class TestSecureOzoneCluster {
 
-  private static final String TEST_USER = "testUgiUser";
+  private static final String TEST_USER = "testUgiUser@EXAMPLE.COM";
   private static final int CLIENT_TIMEOUT = 2 * 1000;
   private Logger logger = LoggerFactory
       .getLogger(TestSecureOzoneCluster.class);
@@ -118,6 +127,7 @@ public final class TestSecureOzoneCluster {
   private UserGroupInformation testKerberosUgi;
   private StorageContainerManager scm;
   private OzoneManager om;
+  private String host;
 
   private static String clusterId;
   private static String scmId;
@@ -137,10 +147,15 @@ public final class TestSecureOzoneCluster {
       final String path = folder.newFolder().toString();
       metaDirPath = Paths.get(path, "om-meta");
       conf.set(OZONE_METADATA_DIRS, metaDirPath.toString());
+      conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
+      conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+          KERBEROS.toString());
+
       startMiniKdc();
       setSecureConfig(conf);
       createCredentialsInKDC(conf, miniKdc);
       generateKeyPair(conf);
+//      OzoneManager.setTestSecureOmFlag(true);
     } catch (IOException e) {
       logger.error("Failed to initialize TestSecureOzoneCluster", e);
     } catch (Exception e) {
@@ -198,7 +213,7 @@ public final class TestSecureOzoneCluster {
   private void setSecureConfig(Configuration configuration) throws IOException {
     configuration.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
     configuration.setBoolean(OZONE_ENABLED, true);
-    String host = InetAddress.getLocalHost().getCanonicalHostName()
+    host = InetAddress.getLocalHost().getCanonicalHostName()
         .toLowerCase();
     String realm = miniKdc.getRealm();
     curUser = UserGroupInformation.getCurrentUser()
@@ -402,7 +417,6 @@ public final class TestSecureOzoneCluster {
    * @throws Exception
    */
   @Test
-  @Ignore("TODO:HDDS-1156")
   public void testDelegationToken() throws Exception {
 
     // Capture logs for assertions
@@ -417,6 +431,7 @@ public final class TestSecureOzoneCluster {
         RPC.getProtocolVersion(OzoneManagerProtocolPB.class);
     try {
       // Start OM
+      om.setCertClient(new CertificateClientTestImpl(conf));
       om.start();
       UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
       String username = ugi.getUserName();
@@ -479,8 +494,7 @@ public final class TestSecureOzoneCluster {
       // initial connection via DT succeeded
       omLogs.clearOutput();
 
-      LambdaTestUtils.intercept(OMException.class, "Renew delegation token " +
-              "failed",
+      LambdaTestUtils.intercept(OMException.class, "INVALID_AUTH_METHOD",
           () -> {
             try {
               omClient.renewDelegationToken(token);
@@ -548,7 +562,6 @@ public final class TestSecureOzoneCluster {
    * @throws Exception
    */
   @Test
-  @Ignore("TODO:HDDS-1156")
   public void testDelegationTokenRenewal() throws Exception {
     GenericTestUtils
         .setLogLevel(LoggerFactory.getLogger(Server.class.getName()), INFO);
@@ -564,6 +577,7 @@ public final class TestSecureOzoneCluster {
     // Start OM
 
     try {
+      om.setCertClient(new CertificateClientTestImpl(conf));
       om.start();
 
       UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
@@ -592,7 +606,7 @@ public final class TestSecureOzoneCluster {
       // 1. When token maxExpiryTime exceeds
       Thread.sleep(500);
       LambdaTestUtils.intercept(OMException.class,
-          "Renew delegation token failed",
+          "TOKEN_EXPIRED",
           () -> {
             try {
               omClient.renewDelegationToken(token);
@@ -608,7 +622,7 @@ public final class TestSecureOzoneCluster {
       // null or empty )
       Token token2 = omClient.getDelegationToken(new Text("randomService"));
       LambdaTestUtils.intercept(OMException.class,
-          "Renew delegation token failed",
+          "Delegation token renewal failed",
           () -> omClient.renewDelegationToken(token2));
       Assert.assertTrue(omLogs.getOutput().contains(" with non-matching " +
           "renewer randomService"));
@@ -623,7 +637,7 @@ public final class TestSecureOzoneCluster {
           tokenId.getBytes(), token2.getPassword(), token2.getKind(),
           token2.getService());
       LambdaTestUtils.intercept(OMException.class,
-          "Renew delegation token failed",
+          "Delegation token renewal failed",
           () -> omClient.renewDelegationToken(tamperedToken));
       Assert.assertTrue(omLogs.getOutput().contains("can't be found in " +
           "cache"));
@@ -643,7 +657,94 @@ public final class TestSecureOzoneCluster {
     omStore.initialize();
     OzoneManager.setTestSecureOmFlag(true);
     om = OzoneManager.createOm(null, config);
-    CertificateClient certClient = new CertificateClientTestImpl(config);
-    om.setCertClient(certClient);
+  }
+
+  /**
+   * Test functionality to get SCM signed certificate for OM.
+   */
+  @Test
+  public void testSecureOmInitSuccess() throws Exception {
+    LogCapturer omLogs =
+        LogCapturer.captureLogs(OzoneManager.getLogger());
+    omLogs.clearOutput();
+    initSCM();
+    try {
+      scm = StorageContainerManager.createSCM(null, conf);
+      scm.start();
+
+      OMStorage omStore = new OMStorage(conf);
+      initializeOmStorage(omStore);
+      OzoneManager.setTestSecureOmFlag(true);
+      om = OzoneManager.createOm(null, conf);
+
+      Assert.assertNotNull(om.getCertificateClient());
+      Assert.assertNotNull(om.getCertificateClient().getPublicKey());
+      Assert.assertNotNull(om.getCertificateClient().getPrivateKey());
+      Assert.assertNotNull(om.getCertificateClient().getCertificate());
+      Assert.assertTrue(omLogs.getOutput().contains("Init response: GETCERT"));
+      Assert.assertTrue(omLogs.getOutput().contains("Successfully stored " +
+          "SCM signed certificate"));
+      X509Certificate certificate = om.getCertificateClient().getCertificate();
+      validateCertificate(certificate);
+    } finally {
+      if (scm != null) {
+        scm.stop();
+      }
+      if (om != null) {
+        om.stop();
+      }
+
+    }
+
+  }
+
+  public void validateCertificate(X509Certificate cert) throws Exception {
+
+    // Assert that we indeed have a self signed certificate.
+    X500Name x500Issuer = new JcaX509CertificateHolder(cert).getIssuer();
+    RDN cn = x500Issuer.getRDNs(BCStyle.CN)[0];
+    String hostName = InetAddress.getLocalHost().getHostName();
+    String scmUser = "scm@" + hostName;
+    Assert.assertEquals(scmUser, cn.getFirst().getValue().toString());
+
+    // Subject name should be om login user in real world but in this test
+    // UGI has scm user context.
+    Assert.assertEquals(scmUser, cn.getFirst().getValue().toString());
+
+    LocalDate today = LocalDateTime.now().toLocalDate();
+    Date invalidDate;
+
+    // Make sure the end date is honored.
+    invalidDate = java.sql.Date.valueOf(today.plus(1, ChronoUnit.DAYS));
+    Assert.assertTrue(cert.getNotAfter().after(invalidDate));
+
+    invalidDate = java.sql.Date.valueOf(today.plus(400, ChronoUnit.DAYS));
+    Assert.assertTrue(cert.getNotAfter().before(invalidDate));
+
+    Assert.assertTrue(cert.getSubjectDN().toString().contains(scmId));
+    Assert.assertTrue(cert.getSubjectDN().toString().contains(clusterId));
+
+    Assert.assertTrue(cert.getIssuerDN().toString().contains(scmUser));
+    Assert.assertTrue(cert.getIssuerDN().toString().contains(scmId));
+    Assert.assertTrue(cert.getIssuerDN().toString().contains(clusterId));
+
+    // Verify that certificate matches the public key.
+    String encodedKey1 = cert.getPublicKey().toString();
+    String encodedKey2 = om.getCertificateClient().getPublicKey().toString();
+    Assert.assertEquals(encodedKey1, encodedKey2);
+  }
+
+  private void initializeOmStorage(OMStorage omStorage) throws IOException {
+    if (omStorage.getState() == Storage.StorageState.INITIALIZED) {
+      return;
+    }
+    omStorage.setClusterId(clusterId);
+    omStorage.setScmId(scmId);
+    omStorage.setOmId(omId);
+    // Initialize ozone certificate client if security is enabled.
+    if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+      OzoneManager.initializeSecurity(conf, omStorage);
+    }
+    omStorage.initialize();
   }
 }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
index bb5d44ba42f..7640f40f7f3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/CertificateClientTestImpl.java
@@ -16,6 +16,7 @@
  */
 package org.apache.hadoop.ozone.client;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
@@ -26,6 +27,7 @@ import org.apache.hadoop.hdds.security.x509.keys.HDDSKeyGenerator;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyPair;
 import java.security.PrivateKey;
@@ -45,27 +47,14 @@ public class CertificateClientTestImpl implements CertificateClient {
 
   private final SecurityConfig securityConfig;
   private final KeyPair keyPair;
-  private final X509Certificate cert;
+  private final Configuration config;
 
   public CertificateClientTestImpl(OzoneConfiguration conf) throws Exception{
     securityConfig = new SecurityConfig(conf);
     HDDSKeyGenerator keyGen =
         new HDDSKeyGenerator(securityConfig.getConfiguration());
     keyPair = keyGen.generateKey();
-
-    SelfSignedCertificate.Builder builder =
-        SelfSignedCertificate.newBuilder()
-            .setBeginDate(LocalDate.now())
-            .setEndDate(LocalDate.now().plus(365, ChronoUnit.DAYS))
-            .setClusterID("cluster1")
-            .setKey(keyPair)
-            .setSubject("TestCertSub")
-            .setConfiguration(conf)
-            .setScmID("TestScmId1")
-            .makeCA();
-
-    X509CertificateHolder certificateHolder = builder.build();
-    cert = new JcaX509CertificateConverter().getCertificate(certificateHolder);
+    config = conf;
   }
 
   @Override
@@ -80,7 +69,24 @@ public class CertificateClientTestImpl implements CertificateClient {
 
   @Override
   public X509Certificate getCertificate() {
-    return cert;
+    SelfSignedCertificate.Builder builder =
+        SelfSignedCertificate.newBuilder()
+            .setBeginDate(LocalDate.now())
+            .setEndDate(LocalDate.now().plus(365, ChronoUnit.DAYS))
+            .setClusterID("cluster1")
+            .setKey(keyPair)
+            .setSubject("TestCertSub")
+            .setConfiguration(config)
+            .setScmID("TestScmId1")
+            .makeCA();
+    X509CertificateHolder certificateHolder = null;
+    try {
+      certificateHolder = builder.build();
+      return new JcaX509CertificateConverter().getCertificate(
+          certificateHolder);
+    } catch (IOException | java.security.cert.CertificateException e) {
+    }
+    return null;
   }
 
   @Override
@@ -113,7 +119,7 @@ public class CertificateClientTestImpl implements CertificateClient {
 
   @Override
   public CertificateSignRequest.Builder getCSRBuilder() {
-    return null;
+    return new CertificateSignRequest.Builder();
   }
 
   @Override
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java
index 24153352905..bf4f4d44861 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCloseContainerHandlingByClient.java
@@ -24,9 +24,6 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.scm.container.ContainerID;
 import org.apache.hadoop.hdds.scm.container.ContainerInfo;
-import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
-import org.apache.hadoop.hdds.scm.events.SCMEvents;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.OzoneConfigKeys;
@@ -43,8 +40,6 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand;
-import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -56,7 +51,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT;
@@ -232,22 +226,32 @@ public class TestCloseContainerHandlingByClient {
   public void testMultiBlockWrites2() throws Exception {
     String keyName = getKeyName();
     OzoneOutputStream key =
-        createKey(keyName, ReplicationType.RATIS, 4 * blockSize);
+        createKey(keyName, ReplicationType.RATIS, 2 * blockSize);
     KeyOutputStream keyOutputStream =
         (KeyOutputStream) key.getOutputStream();
 
     Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
-    // With the initial size provided, it should have pre allocated 4 blocks
-    Assert.assertEquals(4, keyOutputStream.getStreamEntries().size());
+    // With the initial size provided, it should have pre allocated 2 blocks
+    Assert.assertEquals(2, keyOutputStream.getStreamEntries().size());
     String dataString =
         ContainerTestHelper.getFixedLengthString(keyString, (2 * blockSize));
     byte[] data = dataString.getBytes(UTF_8);
     key.write(data);
-    // 3 block are completely written to the DataNode in 3 blocks.
+    // 2 block are completely written to the DataNode in 3 blocks.
     // Data of length half of chunkSize resides in the chunkOutput stream buffer
     String dataString2 =
-        ContainerTestHelper.getFixedLengthString(keyString, chunkSize * 1 / 2);
+        ContainerTestHelper.getFixedLengthString(keyString, chunkSize);
     key.write(dataString2.getBytes(UTF_8));
+    key.flush();
+
+    String dataString3 =
+        ContainerTestHelper.getFixedLengthString(keyString, chunkSize);
+    key.write(dataString3.getBytes(UTF_8));
+    key.flush();
+
+    String dataString4 =
+        ContainerTestHelper.getFixedLengthString(keyString, chunkSize * 1 / 2);
+    key.write(dataString4.getBytes(UTF_8));
     //get the name of a valid container
     OmKeyArgs keyArgs = new OmKeyArgs.Builder().setVolumeName(volumeName)
         .setBucketName(bucketName).setType(HddsProtos.ReplicationType.RATIS)
@@ -260,15 +264,16 @@ public class TestCloseContainerHandlingByClient {
     // read the key from OM again and match the length.The length will still
     // be the equal to the original data size.
     OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
-    List<OmKeyLocationInfo> keyLocationInfos =
-        keyInfo.getKeyLocationVersions().get(0).getBlocksLatestVersionOnly();
     // Though we have written only block initially, the close will hit
     // closeContainerException and remaining data in the chunkOutputStream
     // buffer will be copied into a different allocated block and will be
     // committed.
-    Assert.assertEquals(dataString.concat(dataString2).getBytes(UTF_8).length,
+
+    String dataCommitted =
+        dataString.concat(dataString2).concat(dataString3).concat(dataString4);
+    Assert.assertEquals(dataCommitted.getBytes(UTF_8).length,
         keyInfo.getDataSize());
-    validateData(keyName, dataString.concat(dataString2).getBytes(UTF_8));
+    validateData(keyName, dataCommitted.getBytes(UTF_8));
   }
 
   @Test
@@ -337,55 +342,8 @@ public class TestCloseContainerHandlingByClient {
       containerIdList.add(info.getContainerID());
     }
     Assert.assertTrue(!containerIdList.isEmpty());
-    waitForContainerClose(containerIdList.toArray(new Long[0]));
-  }
-
-  private void waitForContainerClose(Long... containerIdList)
-      throws ContainerNotFoundException, PipelineNotFoundException,
-      TimeoutException, InterruptedException {
-    List<Pipeline> pipelineList = new ArrayList<>();
-    for (long containerID : containerIdList) {
-      cluster.getStorageContainerManager().getEventQueue()
-          .fireEvent(SCMEvents.CLOSE_CONTAINER,
-              ContainerID.valueof(containerID));
-      ContainerInfo container =
-          cluster.getStorageContainerManager().getContainerManager()
-              .getContainer(ContainerID.valueof(containerID));
-      Pipeline pipeline =
-          cluster.getStorageContainerManager().getPipelineManager()
-              .getPipeline(container.getPipelineID());
-      pipelineList.add(pipeline);
-      List<DatanodeDetails> datanodes = pipeline.getNodes();
-      for (DatanodeDetails details : datanodes) {
-        Assert.assertFalse(ContainerTestHelper
-            .isContainerClosed(cluster, containerID, details));
-        // send the order to close the container
-        cluster.getStorageContainerManager().getScmNodeManager()
-            .addDatanodeCommand(details.getUuid(),
-                new CloseContainerCommand(containerID, pipeline.getId()));
-      }
-    }
-    int index = 0;
-    for (long containerID : containerIdList) {
-      Pipeline pipeline = pipelineList.get(index);
-      List<DatanodeDetails> datanodes = pipeline.getNodes();
-      // Below condition avoids the case where container has been allocated
-      // but not yet been used by the client. In such a case container is never
-      // created.
-      if (datanodes.stream().anyMatch(dn -> ContainerTestHelper
-          .isContainerPresent(cluster, containerID, dn))) {
-        for (DatanodeDetails datanodeDetails : datanodes) {
-          GenericTestUtils.waitFor(() -> ContainerTestHelper
-                  .isContainerClosed(cluster, containerID, datanodeDetails),
-              500, 15 * 1000);
-          //double check if it's really closed
-          // (waitFor also throws an exception)
-          Assert.assertTrue(ContainerTestHelper
-              .isContainerClosed(cluster, containerID, datanodeDetails));
-        }
-      }
-      index++;
-    }
+    ContainerTestHelper
+        .waitForContainerClose(cluster, containerIdList.toArray(new Long[0]));
   }
 
   @Ignore // test needs to be fixed after close container is handled for
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
index 3d826a5b0b0..68f1eccb2ad 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java
@@ -29,6 +29,8 @@ import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneClientFactory;
 import org.apache.hadoop.ozone.client.io.KeyOutputStream;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
+import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher;
+import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.test.GenericTestUtils;
@@ -41,6 +43,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.hadoop.hdds.HddsConfigKeys.
@@ -133,21 +136,49 @@ public class TestContainerStateMachineFailures {
         groupOutputStream.getLocationInfoList();
     Assert.assertEquals(1, locationInfoList.size());
     OmKeyLocationInfo omKeyLocationInfo = locationInfoList.get(0);
-
     // delete the container dir
     FileUtil.fullyDelete(new File(
         cluster.getHddsDatanodes().get(0).getDatanodeStateMachine()
             .getContainer().getContainerSet()
             .getContainer(omKeyLocationInfo.getContainerID()).getContainerData()
             .getContainerPath()));
-
     key.close();
+    long containerID = omKeyLocationInfo.getContainerID();
+
     // Make sure the container is marked unhealthy
     Assert.assertTrue(
         cluster.getHddsDatanodes().get(0).getDatanodeStateMachine()
             .getContainer().getContainerSet()
-            .getContainer(omKeyLocationInfo.getContainerID())
+            .getContainer(containerID)
             .getContainerState()
             == ContainerProtos.ContainerDataProto.State.UNHEALTHY);
+    OzoneContainer ozoneContainer = cluster.getHddsDatanodes().get(0)
+        .getDatanodeStateMachine().getContainer();
+    // make sure the missing containerSet is empty
+    HddsDispatcher dispatcher = (HddsDispatcher) ozoneContainer.getDispatcher();
+    Assert.assertTrue(dispatcher.getMissingContainerSet().isEmpty());
+
+    // restart the hdds datanode and see if the container is listed in the
+    // in the missing container set and not in the regular set
+    cluster.restartHddsDatanode(0, true);
+    ozoneContainer = cluster.getHddsDatanodes().get(0)
+        .getDatanodeStateMachine().getContainer();
+    dispatcher = (HddsDispatcher) ozoneContainer.getDispatcher();
+
+    Assert
+        .assertNull(ozoneContainer.getContainerSet().getContainer(containerID));
+    Assert.assertTrue(dispatcher.getMissingContainerSet()
+        .contains(containerID));
+    ContainerProtos.ContainerCommandRequestProto.Builder request =
+        ContainerProtos.ContainerCommandRequestProto.newBuilder();
+    request.setCmdType(ContainerProtos.Type.CreateContainer);
+    request.setContainerID(containerID);
+    request.setCreateContainer(
+        ContainerProtos.CreateContainerRequestProto.getDefaultInstance());
+    request.setTraceID(UUID.randomUUID().toString());
+    request.setDatanodeUuid(
+        cluster.getHddsDatanodes().get(0).getDatanodeDetails().getUuidString());
+    Assert.assertEquals(ContainerProtos.Result.CONTAINER_MISSING,
+        dispatcher.dispatch(request.build(), null).getResult());
   }
 }
\ No newline at end of file
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
index f94257cacbb..092c56f3688 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
@@ -17,6 +17,7 @@
 
 package org.apache.hadoop.ozone.client.rpc;
 
+import org.apache.hadoop.hdds.client.BlockID;
 import org.apache.hadoop.hdds.client.ReplicationType;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -36,12 +37,11 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -54,16 +54,16 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTER
  */
 public class TestFailureHandlingByClient {
 
-  private static MiniOzoneCluster cluster;
-  private static OzoneConfiguration conf;
-  private static OzoneClient client;
-  private static ObjectStore objectStore;
-  private static int chunkSize;
-  private static int blockSize;
-  private static String volumeName;
-  private static String bucketName;
-  private static String keyString;
-  private static int maxRetries;
+  private MiniOzoneCluster cluster;
+  private OzoneConfiguration conf;
+  private OzoneClient client;
+  private ObjectStore objectStore;
+  private int chunkSize;
+  private int blockSize;
+  private String volumeName;
+  private String bucketName;
+  private String keyString;
+  private int maxRetries;
 
   /**
    * Create a MiniDFSCluster for testing.
@@ -72,8 +72,7 @@ public class TestFailureHandlingByClient {
    *
    * @throws IOException
    */
-  @Before
-  public void init() throws Exception {
+  private void init() throws Exception {
     conf = new OzoneConfiguration();
     maxRetries = 100;
     chunkSize = (int) OzoneConsts.MB;
@@ -101,11 +100,14 @@ public class TestFailureHandlingByClient {
     objectStore.getVolume(volumeName).createBucket(bucketName);
   }
 
+  private void startCluster() throws Exception {
+    init();
+  }
+
   /**
    * Shutdown MiniDFSCluster.
    */
-  @After
-  public void shutdown() {
+  private void shutdown() {
     if (cluster != null) {
       cluster.shutdown();
     }
@@ -113,6 +115,7 @@ public class TestFailureHandlingByClient {
 
   @Test
   public void testBlockWritesWithDnFailures() throws Exception {
+    startCluster();
     String keyName = UUID.randomUUID().toString();
     OzoneOutputStream key = createKey(keyName, ReplicationType.RATIS, 0);
     byte[] data =
@@ -148,10 +151,12 @@ public class TestFailureHandlingByClient {
     OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
     Assert.assertEquals(data.length, keyInfo.getDataSize());
     validateData(keyName, data);
+    shutdown();
   }
 
   @Test
   public void testMultiBlockWritesWithDnFailures() throws Exception {
+    startCluster();
     String keyName = "ratis3";
     OzoneOutputStream key = createKey(keyName, ReplicationType.RATIS, 0);
     String data =
@@ -188,11 +193,13 @@ public class TestFailureHandlingByClient {
     OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
     Assert.assertEquals(2 * data.getBytes().length, keyInfo.getDataSize());
     validateData(keyName, data.concat(data).getBytes());
+    shutdown();
   }
 
   @Test
   public void testMultiBlockWritesWithIntermittentDnFailures()
       throws Exception {
+    startCluster();
     String keyName = UUID.randomUUID().toString();
     OzoneOutputStream key =
         createKey(keyName, ReplicationType.RATIS, 6 * blockSize);
@@ -232,8 +239,235 @@ public class TestFailureHandlingByClient {
     OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
     Assert.assertEquals(3 * data.getBytes().length, keyInfo.getDataSize());
     validateData(keyName, data.concat(data).concat(data).getBytes());
+    shutdown();
   }
 
+  @Test
+  public void testWriteSmallFile() throws Exception {
+    startCluster();
+    String keyName = UUID.randomUUID().toString();
+    OzoneOutputStream key =
+        createKey(keyName, ReplicationType.RATIS, 0);
+    String data = ContainerTestHelper
+        .getFixedLengthString(keyString,  chunkSize/2);
+    key.write(data.getBytes());
+    // get the name of a valid container
+    Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
+    KeyOutputStream keyOutputStream =
+        (KeyOutputStream) key.getOutputStream();
+    List<OmKeyLocationInfo> locationInfoList =
+        keyOutputStream.getLocationInfoList();
+    long containerId = locationInfoList.get(0).getContainerID();
+    BlockID blockId = locationInfoList.get(0).getBlockID();
+    ContainerInfo container =
+        cluster.getStorageContainerManager().getContainerManager()
+            .getContainer(ContainerID.valueof(containerId));
+    Pipeline pipeline =
+        cluster.getStorageContainerManager().getPipelineManager()
+            .getPipeline(container.getPipelineID());
+    List<DatanodeDetails> datanodes = pipeline.getNodes();
+
+    cluster.shutdownHddsDatanode(datanodes.get(0));
+    cluster.shutdownHddsDatanode(datanodes.get(1));
+    key.close();
+    // this will throw AlreadyClosedException and and current stream
+    // will be discarded and write a new block
+    OmKeyArgs keyArgs = new OmKeyArgs.Builder().setVolumeName(volumeName)
+        .setBucketName(bucketName).setType(HddsProtos.ReplicationType.RATIS)
+        .setFactor(HddsProtos.ReplicationFactor.THREE).setKeyName(keyName)
+        .build();
+    OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
+
+    // Make sure a new block is written
+    Assert.assertNotEquals(
+        keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().get(0)
+            .getBlockID(), blockId);
+    Assert.assertEquals(data.getBytes().length, keyInfo.getDataSize());
+    validateData(keyName, data.getBytes());
+    shutdown();
+  }
+
+
+  @Test
+  public void testContainerExclusionWithClosedContainerException()
+      throws Exception {
+    startCluster();
+    String keyName = UUID.randomUUID().toString();
+    OzoneOutputStream key =
+        createKey(keyName, ReplicationType.RATIS, blockSize);
+    String data = ContainerTestHelper
+        .getFixedLengthString(keyString,  chunkSize);
+
+    // get the name of a valid container
+    Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
+    KeyOutputStream keyOutputStream =
+        (KeyOutputStream) key.getOutputStream();
+    List<OmKeyLocationInfo> locationInfoList =
+        keyOutputStream.getLocationInfoList();
+
+    // Assert that 1 block will be preallocated
+    Assert.assertEquals(1, locationInfoList.size());
+    key.write(data.getBytes());
+    key.flush();
+    long containerId = locationInfoList.get(0).getContainerID();
+    BlockID blockId = locationInfoList.get(0).getBlockID();
+    List<Long> containerIdList = new ArrayList<>();
+    containerIdList.add(containerId);
+
+    // below check will assert if the container does not get closed
+    ContainerTestHelper
+        .waitForContainerClose(cluster, containerIdList.toArray(new Long[0]));
+
+    // This write will hit ClosedContainerException and this container should
+    // will be added in the excludelist
+    key.write(data.getBytes());
+    key.flush();
+
+    Assert.assertTrue(keyOutputStream.getExcludeList().getContainerIds()
+        .contains(ContainerID.valueof(containerId)));
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getDatanodes().isEmpty());
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getPipelineIds().isEmpty());
+
+    // The close will just write to the buffer
+    key.close();
+    OmKeyArgs keyArgs = new OmKeyArgs.Builder().setVolumeName(volumeName)
+        .setBucketName(bucketName).setType(HddsProtos.ReplicationType.RATIS)
+        .setFactor(HddsProtos.ReplicationFactor.THREE).setKeyName(keyName)
+        .build();
+    OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
+
+    // Make sure a new block is written
+    Assert.assertNotEquals(
+        keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().get(0)
+            .getBlockID(), blockId);
+    Assert.assertEquals(2 * data.getBytes().length, keyInfo.getDataSize());
+    validateData(keyName, data.concat(data).getBytes());
+    shutdown();
+  }
+
+  @Test
+  public void testDatanodeExclusionWithMajorityCommit() throws Exception {
+    startCluster();
+    String keyName = UUID.randomUUID().toString();
+    OzoneOutputStream key =
+        createKey(keyName, ReplicationType.RATIS, blockSize);
+    String data = ContainerTestHelper
+        .getFixedLengthString(keyString,  chunkSize);
+
+    // get the name of a valid container
+    Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
+    KeyOutputStream keyOutputStream =
+        (KeyOutputStream) key.getOutputStream();
+    List<OmKeyLocationInfo> locationInfoList =
+        keyOutputStream.getLocationInfoList();
+
+    // Assert that 1 block will be preallocated
+    Assert.assertEquals(1, locationInfoList.size());
+    key.write(data.getBytes());
+    key.flush();
+    long containerId = locationInfoList.get(0).getContainerID();
+    BlockID blockId = locationInfoList.get(0).getBlockID();
+    ContainerInfo container =
+        cluster.getStorageContainerManager().getContainerManager()
+            .getContainer(ContainerID.valueof(containerId));
+    Pipeline pipeline =
+        cluster.getStorageContainerManager().getPipelineManager()
+            .getPipeline(container.getPipelineID());
+    List<DatanodeDetails> datanodes = pipeline.getNodes();
+
+    // shutdown 1 datanode. This will make sure the 2 way commit happens for
+    // next write ops.
+    cluster.shutdownHddsDatanode(datanodes.get(0));
+
+    key.write(data.getBytes());
+    key.write(data.getBytes());
+    // The close will just write to the buffer
+    key.close();
+    Assert.assertTrue(keyOutputStream.getExcludeList().getDatanodes()
+        .contains(datanodes.get(0)));
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getContainerIds().isEmpty());
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getPipelineIds().isEmpty());
+
+    OmKeyArgs keyArgs = new OmKeyArgs.Builder().setVolumeName(volumeName)
+        .setBucketName(bucketName).setType(HddsProtos.ReplicationType.RATIS)
+        .setFactor(HddsProtos.ReplicationFactor.THREE).setKeyName(keyName)
+        .build();
+    OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
+
+    // Make sure a new block is written
+    Assert.assertNotEquals(
+        keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().get(0)
+            .getBlockID(), blockId);
+    Assert.assertEquals(3 * data.getBytes().length, keyInfo.getDataSize());
+    validateData(keyName, data.concat(data).concat(data).getBytes());
+    shutdown();
+  }
+
+
+  @Test
+  public void testPipelineExclusionWithPipelineFailure() throws Exception {
+    startCluster();
+    String keyName = UUID.randomUUID().toString();
+    OzoneOutputStream key =
+        createKey(keyName, ReplicationType.RATIS, blockSize);
+    String data = ContainerTestHelper
+        .getFixedLengthString(keyString,  chunkSize);
+
+    // get the name of a valid container
+    Assert.assertTrue(key.getOutputStream() instanceof KeyOutputStream);
+    KeyOutputStream keyOutputStream =
+        (KeyOutputStream) key.getOutputStream();
+    List<OmKeyLocationInfo> locationInfoList =
+        keyOutputStream.getLocationInfoList();
+
+    // Assert that 1 block will be preallocated
+    Assert.assertEquals(1, locationInfoList.size());
+    key.write(data.getBytes());
+    key.flush();
+    long containerId = locationInfoList.get(0).getContainerID();
+    BlockID blockId = locationInfoList.get(0).getBlockID();
+    ContainerInfo container =
+        cluster.getStorageContainerManager().getContainerManager()
+            .getContainer(ContainerID.valueof(containerId));
+    Pipeline pipeline =
+        cluster.getStorageContainerManager().getPipelineManager()
+            .getPipeline(container.getPipelineID());
+    List<DatanodeDetails> datanodes = pipeline.getNodes();
+
+    // Two nodes, next write will hit AlraedyClosedException , the pipeline
+    // will be added in the exclude list
+    cluster.shutdownHddsDatanode(datanodes.get(0));
+    cluster.shutdownHddsDatanode(datanodes.get(1));
+
+    key.write(data.getBytes());
+    key.write(data.getBytes());
+    // The close will just write to the buffer
+    key.close();
+    Assert.assertTrue(keyOutputStream.getExcludeList().getPipelineIds()
+        .contains(pipeline.getId()));
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getContainerIds().isEmpty());
+    Assert.assertTrue(
+        keyOutputStream.getExcludeList().getDatanodes().isEmpty());
+
+    OmKeyArgs keyArgs = new OmKeyArgs.Builder().setVolumeName(volumeName)
+        .setBucketName(bucketName).setType(HddsProtos.ReplicationType.RATIS)
+        .setFactor(HddsProtos.ReplicationFactor.THREE).setKeyName(keyName)
+        .build();
+    OmKeyInfo keyInfo = cluster.getOzoneManager().lookupKey(keyArgs);
+
+    // Make sure a new block is written
+    Assert.assertNotEquals(
+        keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().get(0)
+            .getBlockID(), blockId);
+    Assert.assertEquals(3 * data.getBytes().length, keyInfo.getDataSize());
+    validateData(keyName, data.concat(data).concat(data).getBytes());
+    shutdown();
+  }
 
   private OzoneOutputStream createKey(String keyName, ReplicationType type,
       long size) throws Exception {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index 32792ae149d..0828fe833c6 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -65,8 +65,6 @@ import org.apache.hadoop.ozone.client.VolumeArgs;
 import org.apache.hadoop.ozone.client.io.OzoneInputStream;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
 import org.apache.hadoop.ozone.client.rest.OzoneException;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyInfo;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
 import org.apache.hadoop.ozone.common.OzoneChecksumException;
 import org.apache.hadoop.ozone.container.common.helpers.BlockData;
 import org.apache.hadoop.ozone.container.common.interfaces.Container;
@@ -76,6 +74,7 @@ import org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerLocat
 import org.apache.hadoop.ozone.om.OzoneManager;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
@@ -189,9 +188,10 @@ public abstract class TestOzoneRpcClientAbstract {
    */
   @Test
   public void testOMClientProxyProvider() {
-    OMProxyProvider omProxyProvider = store.getClientProxy()
+    OMFailoverProxyProvider omFailoverProxyProvider = store.getClientProxy()
         .getOMProxyProvider();
-    List<OMProxyInfo> omProxies = omProxyProvider.getOMProxies();
+    List<OMFailoverProxyProvider.OMProxyInfo> omProxies =
+        omFailoverProxyProvider.getOMProxies();
 
     // For a non-HA OM service, there should be only one OM proxy.
     Assert.assertEquals(1, omProxies.size());
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
index ad5adc7efa9..d06cee7bc4c 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java
@@ -31,6 +31,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
+import java.util.concurrent.TimeoutException;
 
 import org.apache.hadoop.conf.StorageUnit;
 import org.apache.hadoop.hdds.HddsUtils;
@@ -44,8 +45,13 @@ import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerC
 import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.KeyValue;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
+import org.apache.hadoop.hdds.scm.container.ContainerID;
+import org.apache.hadoop.hdds.scm.container.ContainerInfo;
+import org.apache.hadoop.hdds.scm.container.ContainerNotFoundException;
+import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException;
 import org.apache.hadoop.hdds.security.token.OzoneBlockTokenIdentifier;
 import org.apache.hadoop.ozone.HddsDatanodeService;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
@@ -62,6 +68,7 @@ import org.apache.hadoop.ozone.container.common.interfaces.Container;
 import org.apache.hadoop.security.token.Token;
 
 import com.google.common.base.Preconditions;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
 import org.junit.Assert;
 import org.slf4j.Logger;
@@ -697,4 +704,57 @@ public final class ContainerTestHelper {
   public static String getFixedLengthString(String string, int length) {
     return String.format("%1$" + length + "s", string);
   }
+
+  public static void waitForContainerClose(MiniOzoneCluster cluster,
+      Long... containerIdList)
+      throws ContainerNotFoundException, PipelineNotFoundException,
+      TimeoutException, InterruptedException {
+    List<Pipeline> pipelineList = new ArrayList<>();
+    for (long containerID : containerIdList) {
+      ContainerInfo container =
+          cluster.getStorageContainerManager().getContainerManager()
+              .getContainer(ContainerID.valueof(containerID));
+      Pipeline pipeline =
+          cluster.getStorageContainerManager().getPipelineManager()
+              .getPipeline(container.getPipelineID());
+      pipelineList.add(pipeline);
+      List<DatanodeDetails> datanodes = pipeline.getNodes();
+
+      for (DatanodeDetails details : datanodes) {
+        // Client will issue write chunk and it will create the container on
+        // datanodes.
+        // wait for the container to be created
+        GenericTestUtils
+            .waitFor(() -> isContainerPresent(cluster, containerID, details),
+                500, 100 * 1000);
+        Assert.assertTrue(isContainerPresent(cluster, containerID, details));
+
+        // make sure the container gets created first
+        Assert.assertFalse(ContainerTestHelper
+            .isContainerClosed(cluster, containerID, details));
+        // send the order to close the container
+        cluster.getStorageContainerManager().getEventQueue()
+            .fireEvent(SCMEvents.CLOSE_CONTAINER,
+                ContainerID.valueof(containerID));
+      }
+    }
+    int index = 0;
+    for (long containerID : containerIdList) {
+      Pipeline pipeline = pipelineList.get(index);
+      List<DatanodeDetails> datanodes = pipeline.getNodes();
+      // Below condition avoids the case where container has been allocated
+      // but not yet been used by the client. In such a case container is never
+      // created.
+      for (DatanodeDetails datanodeDetails : datanodes) {
+        GenericTestUtils.waitFor(() -> ContainerTestHelper
+                .isContainerClosed(cluster, containerID, datanodeDetails), 500,
+            15 * 1000);
+        //double check if it's really closed
+        // (waitFor also throws an exception)
+        Assert.assertTrue(ContainerTestHelper
+            .isContainerClosed(cluster, containerID, datanodeDetails));
+      }
+      index++;
+    }
+  }
 }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
index d0a991c446f..d2f2c910549 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
@@ -51,6 +51,7 @@ import static org.apache.ratis.rpc.SupportedRpcType.GRPC;
 import org.apache.ratis.protocol.RaftGroupId;
 import org.apache.ratis.util.function.CheckedBiConsumer;
 
+import java.util.Set;
 import java.util.function.BiConsumer;
 
 import org.junit.Test;
@@ -196,5 +197,9 @@ public class TestCSMMetrics {
     public void setScmId(String scmId) {
 
     }
+
+    @Override
+    public void buildMissingContainerSet(Set<Long> createdContainerSet) {
+    }
   }
 }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
index 8540939a90e..63abd36aa8a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestContainerServer.java
@@ -68,6 +68,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Set;
 
 import static org.apache.ratis.rpc.SupportedRpcType.GRPC;
 import static org.apache.ratis.rpc.SupportedRpcType.NETTY;
@@ -286,5 +287,9 @@ public class TestContainerServer {
     public void setScmId(String scmId) {
 
     }
+
+    @Override
+    public void buildMissingContainerSet(Set<Long> createdContainerSet) {
+    }
   }
 }
\ No newline at end of file
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index 887c35ad682..f20feffce9a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -58,6 +58,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_BLOCK_TOKEN_ENABLED;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
@@ -232,7 +233,10 @@ public class TestSecureContainerServer {
 
     @Override
     public void setScmId(String scmId) {
+    }
 
+    @Override
+    public void buildMissingContainerSet(Set<Long> createdContainerSet) {
     }
   }
 
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
new file mode 100644
index 00000000000..75dd880d230
--- /dev/null
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
@@ -0,0 +1,176 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.om;
+
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.
+    OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.UUID;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+import org.mockito.Matchers;
+
+import static org.apache.hadoop.ozone.OzoneConsts.
+    OZONE_DB_CHECKPOINT_REQUEST_FLUSH;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Class used for testing the OM DB Checkpoint provider servlet.
+ */
+public class TestOMDbCheckpointServlet {
+  private MiniOzoneCluster cluster = null;
+  private OMMetrics omMetrics;
+  private OzoneConfiguration conf;
+  private String clusterId;
+  private String scmId;
+  private String omId;
+
+  @Rule
+  public Timeout timeout = new Timeout(60000);
+
+  /**
+   * Create a MiniDFSCluster for testing.
+   * <p>
+   * Ozone is made active by setting OZONE_ENABLED = true
+   *
+   * @throws IOException
+   */
+  @Before
+  public void init() throws Exception {
+    conf = new OzoneConfiguration();
+    clusterId = UUID.randomUUID().toString();
+    scmId = UUID.randomUUID().toString();
+    omId = UUID.randomUUID().toString();
+    conf.setBoolean(OZONE_ACL_ENABLED, true);
+    conf.setInt(OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS, 2);
+    cluster = MiniOzoneCluster.newBuilder(conf)
+        .setClusterId(clusterId)
+        .setScmId(scmId)
+        .setOmId(omId)
+        .build();
+    cluster.waitForClusterToBeReady();
+    omMetrics = cluster.getOzoneManager().getMetrics();
+  }
+
+  /**
+   * Shutdown MiniDFSCluster.
+   */
+  @After
+  public void shutdown() {
+    if (cluster != null) {
+      cluster.shutdown();
+    }
+  }
+
+  @Test
+  public void testDoGet() throws ServletException, IOException {
+
+    File tempFile = null;
+    try {
+      OMDBCheckpointServlet omDbCheckpointServletMock =
+          mock(OMDBCheckpointServlet.class);
+
+      doCallRealMethod().when(omDbCheckpointServletMock).init();
+
+      HttpServletRequest requestMock = mock(HttpServletRequest.class);
+      HttpServletResponse responseMock = mock(HttpServletResponse.class);
+
+      ServletContext servletContextMock = mock(ServletContext.class);
+      when(omDbCheckpointServletMock.getServletContext())
+          .thenReturn(servletContextMock);
+
+      when(servletContextMock.getAttribute(OzoneConsts.OM_CONTEXT_ATTRIBUTE))
+          .thenReturn(cluster.getOzoneManager());
+      when(requestMock.getParameter(OZONE_DB_CHECKPOINT_REQUEST_FLUSH))
+          .thenReturn("true");
+      doNothing().when(responseMock).setContentType("application/x-tgz");
+      doNothing().when(responseMock).setHeader(Matchers.anyString(),
+          Matchers.anyString());
+
+      tempFile = File.createTempFile("testDoGet_" + System
+          .currentTimeMillis(), ".tar.gz");
+
+      FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+      when(responseMock.getOutputStream()).thenReturn(
+          new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+              return true;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+              fileOutputStream.write(b);
+            }
+          });
+
+      doCallRealMethod().when(omDbCheckpointServletMock).doGet(requestMock,
+          responseMock);
+
+      omDbCheckpointServletMock.init();
+
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointCreationTimeTaken() == 0);
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointTarOperationTimeTaken() == 0);
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointStreamingTimeTaken() == 0);
+
+      omDbCheckpointServletMock.doGet(requestMock, responseMock);
+
+      Assert.assertTrue(tempFile.length() > 0);
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointCreationTimeTaken() > 0);
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointTarOperationTimeTaken() > 0);
+      Assert.assertTrue(
+          omMetrics.getLastCheckpointStreamingTimeTaken() > 0);
+    } finally {
+      FileUtils.deleteQuietly(tempFile);
+    }
+
+  }
+}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
index 8c08c8fe113..5361745de46 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.om;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.StorageType;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
@@ -148,7 +149,7 @@ public class TestOmBlockVersioning {
 
     // this block will be appended to the latest version of version 2.
     OmKeyLocationInfo locationInfo =
-        ozoneManager.allocateBlock(keyArgs, openKey.getId());
+        ozoneManager.allocateBlock(keyArgs, openKey.getId(), new ExcludeList());
     List<OmKeyLocationInfo> locationInfoList =
         openKey.getKeyInfo().getLatestVersionLocations()
             .getBlocksLatestVersionOnly();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
index 62cda916d14..86a83b78c8d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
@@ -18,30 +18,29 @@ package org.apache.hadoop.ozone.om;
 
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.hadoop.hdfs.server.datanode.ObjectStoreHandler;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdfs.LogVerificationAppender;
+import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
+import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyInfo;
-import org.apache.hadoop.ozone.client.rpc.ha.OMProxyProvider;
-import org.apache.hadoop.ozone.om.exceptions.OMException;
-import org.apache.hadoop.ozone.web.handlers.UserArgs;
-import org.apache.hadoop.ozone.web.handlers.VolumeArgs;
-import org.apache.hadoop.ozone.web.interfaces.StorageHandler;
-import org.apache.hadoop.ozone.web.response.VolumeInfo;
-import org.apache.hadoop.ozone.web.utils.OzoneUtils;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.ozone.client.OzoneClientFactory;
+import org.apache.hadoop.ozone.client.OzoneVolume;
+import org.apache.hadoop.ozone.client.VolumeArgs;
+import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.Timeout;
 
 import java.io.IOException;
+import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.UUID;
@@ -49,6 +48,12 @@ import java.util.UUID;
 import static org.apache.hadoop.ozone.MiniOzoneHAClusterImpl
     .NODE_FAILURE_TIMEOUT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
+import static org.apache.hadoop.ozone.OzoneConfigKeys
+    .OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY;
+import static org.apache.hadoop.ozone.OzoneConfigKeys
+    .OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_DEFAULT;
+import static org.apache.hadoop.ozone.OzoneConfigKeys
+    .OZONE_CLIENT_RETRY_MAX_ATTEMPTS_KEY;
 import static org.apache.hadoop.ozone.OzoneConfigKeys
     .OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
 
@@ -58,8 +63,7 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys
 public class TestOzoneManagerHA {
 
   private MiniOzoneHAClusterImpl cluster = null;
-  private StorageHandler storageHandler;
-  private UserArgs userArgs;
+  private ObjectStore objectStore;
   private OzoneConfiguration conf;
   private String clusterId;
   private String scmId;
@@ -69,7 +73,7 @@ public class TestOzoneManagerHA {
   public ExpectedException exception = ExpectedException.none();
 
   @Rule
-  public Timeout timeout = new Timeout(60_000);
+  public Timeout timeout = new Timeout(300_000);
 
   /**
    * Create a MiniDFSCluster for testing.
@@ -85,6 +89,8 @@ public class TestOzoneManagerHA {
     scmId = UUID.randomUUID().toString();
     conf.setBoolean(OZONE_ACL_ENABLED, true);
     conf.setInt(OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS, 2);
+    conf.setInt(OZONE_CLIENT_RETRY_MAX_ATTEMPTS_KEY, 3);
+    conf.setInt(OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY, 3);
 
     cluster = (MiniOzoneHAClusterImpl) MiniOzoneCluster.newHABuilder(conf)
         .setClusterId(clusterId)
@@ -93,9 +99,7 @@ public class TestOzoneManagerHA {
         .setNumOfOzoneManagers(numOfOMs)
         .build();
     cluster.waitForClusterToBeReady();
-    storageHandler = new ObjectStoreHandler(conf).getStorageHandler();
-    userArgs = new UserArgs(null, OzoneUtils.getRequestID(),
-        null, null, null, null);
+    objectStore = OzoneClientFactory.getRpcClient(conf).getObjectStore();
   }
 
   /**
@@ -115,7 +119,7 @@ public class TestOzoneManagerHA {
    */
   @Test
   public void testAllOMNodesRunning() throws Exception {
-    testCreateVolume(true);
+    createVolumeTest(true);
   }
 
   /**
@@ -126,52 +130,56 @@ public class TestOzoneManagerHA {
     cluster.stopOzoneManager(1);
     Thread.sleep(NODE_FAILURE_TIMEOUT * 2);
 
-    testCreateVolume(true);
+    createVolumeTest(true);
   }
 
   /**
    * Test client request fails when 2 OMs are down.
    */
   @Test
-  @Ignore("TODO:HDDS-1158")
   public void testTwoOMNodesDown() throws Exception {
     cluster.stopOzoneManager(1);
     cluster.stopOzoneManager(2);
     Thread.sleep(NODE_FAILURE_TIMEOUT * 2);
 
-    testCreateVolume(false);
+    createVolumeTest(false);
   }
 
   /**
    * Create a volume and test its attribute.
    */
-  private void testCreateVolume(boolean checkSuccess) throws Exception {
+  private void createVolumeTest(boolean checkSuccess) throws Exception {
     String userName = "user" + RandomStringUtils.randomNumeric(5);
     String adminName = "admin" + RandomStringUtils.randomNumeric(5);
     String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
 
-    VolumeArgs createVolumeArgs = new VolumeArgs(volumeName, userArgs);
-    createVolumeArgs.setUserName(userName);
-    createVolumeArgs.setAdminName(adminName);
+    VolumeArgs createVolumeArgs = VolumeArgs.newBuilder()
+        .setOwner(userName)
+        .setAdmin(adminName)
+        .build();
 
     try {
-      storageHandler.createVolume(createVolumeArgs);
+      objectStore.createVolume(volumeName, createVolumeArgs);
 
-      VolumeArgs getVolumeArgs = new VolumeArgs(volumeName, userArgs);
-      VolumeInfo retVolumeinfo = storageHandler.getVolumeInfo(getVolumeArgs);
+      OzoneVolume retVolumeinfo = objectStore.getVolume(volumeName);
 
       if (checkSuccess) {
-        Assert.assertTrue(retVolumeinfo.getVolumeName().equals(volumeName));
-        Assert.assertTrue(retVolumeinfo.getOwner().getName().equals(userName));
+        Assert.assertTrue(retVolumeinfo.getName().equals(volumeName));
+        Assert.assertTrue(retVolumeinfo.getOwner().equals(userName));
+        Assert.assertTrue(retVolumeinfo.getAdmin().equals(adminName));
       } else {
         // Verify that the request failed
-        Assert.assertTrue(retVolumeinfo.getVolumeName().isEmpty());
         Assert.fail("There is no quorum. Request should have failed");
       }
-    } catch (OMException e) {
+    } catch (ConnectException | RemoteException e) {
       if (!checkSuccess) {
-        GenericTestUtils.assertExceptionContains(
-            "RaftRetryFailureException", e);
+        // If the last OM to be tried by the RetryProxy is down, we would get
+        // ConnectException. Otherwise, we would get a RemoteException from the
+        // last running OM as it would fail to get a quorum.
+        if (e instanceof RemoteException) {
+          GenericTestUtils.assertExceptionContains(
+              "RaftRetryFailureException", e);
+        }
       } else {
         throw e;
       }
@@ -179,14 +187,16 @@ public class TestOzoneManagerHA {
   }
 
   /**
-   * Test that OMProxyProvider creates an OM proxy for each OM in the cluster.
+   * Test that OMFailoverProxyProvider creates an OM proxy for each OM in the
+   * cluster.
    */
   @Test
-  public void testOMClientProxyProvide() throws Exception {
+  public void testOMProxyProviderInitialization() throws Exception {
     OzoneClient rpcClient = cluster.getRpcClient();
-    OMProxyProvider omProxyProvider =
+    OMFailoverProxyProvider omFailoverProxyProvider =
         rpcClient.getObjectStore().getClientProxy().getOMProxyProvider();
-    List<OMProxyInfo> omProxies = omProxyProvider.getOMProxies();
+    List<OMFailoverProxyProvider.OMProxyInfo> omProxies =
+        omFailoverProxyProvider.getOMProxies();
 
     Assert.assertEquals(numOfOMs, omProxies.size());
 
@@ -194,7 +204,7 @@ public class TestOzoneManagerHA {
       InetSocketAddress omRpcServerAddr =
           cluster.getOzoneManager(i).getOmRpcServerAddr();
       boolean omClientProxyExists = false;
-      for (OMProxyInfo omProxyInfo : omProxies) {
+      for (OMFailoverProxyProvider.OMProxyInfo omProxyInfo : omProxies) {
         if (omProxyInfo.getAddress().equals(omRpcServerAddr)) {
           omClientProxyExists = true;
           break;
@@ -205,4 +215,136 @@ public class TestOzoneManagerHA {
           omClientProxyExists);
     }
   }
+
+  /**
+   * Test OMFailoverProxyProvider failover on connection exception to OM client.
+   */
+  @Test
+  public void testOMProxyProviderFailoverOnConnectionFailure()
+      throws Exception {
+    OMFailoverProxyProvider omFailoverProxyProvider =
+        objectStore.getClientProxy().getOMProxyProvider();
+    String firstProxyNodeId = omFailoverProxyProvider.getCurrentProxyOMNodeId();
+
+    createVolumeTest(true);
+
+    // On stopping the current OM Proxy, the next connection attempt should
+    // failover to a another OM proxy.
+    cluster.stopOzoneManager(firstProxyNodeId);
+    Thread.sleep(OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_DEFAULT * 4);
+
+    // Next request to the proxy provider should result in a failover
+    createVolumeTest(true);
+    Thread.sleep(OZONE_CLIENT_FAILOVER_SLEEP_BASE_MILLIS_DEFAULT);
+
+    // Get the new OM Proxy NodeId
+    String newProxyNodeId = omFailoverProxyProvider.getCurrentProxyOMNodeId();
+
+    // Verify that a failover occured. the new proxy nodeId should be
+    // different from the old proxy nodeId.
+    Assert.assertNotEquals("Failover did not occur as expected",
+        firstProxyNodeId, newProxyNodeId);
+  }
+
+  /**
+   * Test OMFailoverProxyProvider failover when current OM proxy is not
+   * the current OM Leader.
+   */
+  @Test
+  public void testOMProxyProviderFailoverToCurrentLeader() throws Exception {
+    OMFailoverProxyProvider omFailoverProxyProvider =
+        objectStore.getClientProxy().getOMProxyProvider();
+
+    // Run couple of createVolume tests to discover the current Leader OM
+    createVolumeTest(true);
+    createVolumeTest(true);
+
+    // The OMFailoverProxyProvider will point to the current leader OM node.
+    String leaderOMNodeId = omFailoverProxyProvider.getCurrentProxyOMNodeId();
+
+    // Perform a manual failover of the proxy provider to move the
+    // currentProxyIndex to a node other than the leader OM.
+    omFailoverProxyProvider.performFailover(
+        omFailoverProxyProvider.getProxy().proxy);
+
+    String newProxyNodeId = omFailoverProxyProvider.getCurrentProxyOMNodeId();
+    Assert.assertNotEquals(leaderOMNodeId, newProxyNodeId);
+
+    // Once another request is sent to this new proxy node, the leader
+    // information must be returned via the response and a failover must
+    // happen to the leader proxy node.
+    createVolumeTest(true);
+    Thread.sleep(2000);
+
+    String newLeaderOMNodeId =
+        omFailoverProxyProvider.getCurrentProxyOMNodeId();
+
+    // The old and new Leader OM NodeId must match since there was no new
+    // election in the Ratis ring.
+    Assert.assertEquals(leaderOMNodeId, newLeaderOMNodeId);
+  }
+
+  @Test
+  public void testOMRetryProxy() throws Exception {
+    // Stop all the OMs. After making 5 (set maxRetries value) attempts at
+    // connection, the RpcClient should give up.
+    for (int i = 0; i < numOfOMs; i++) {
+      cluster.stopOzoneManager(i);
+    }
+
+    final LogVerificationAppender appender = new LogVerificationAppender();
+    final org.apache.log4j.Logger logger = Logger.getRootLogger();
+    logger.addAppender(appender);
+
+    try {
+      createVolumeTest(true);
+      Assert.fail("TestOMRetryProxy should fail when there are no OMs running");
+    } catch (ConnectException e) {
+      // Each retry attempt tries upto 10 times to connect. So there should be
+      // 3*10 "Retrying connect to server" messages
+      Assert.assertEquals(30,
+          appender.countLinesWithMessage("Retrying connect to server:"));
+
+      Assert.assertEquals(1,
+          appender.countLinesWithMessage("Failed to connect to OM. Attempted " +
+              "3 retries and 3 failovers"));
+    }
+  }
+
+  @Test
+  public void testReadRequest() throws Exception {
+    String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
+    objectStore.createVolume(volumeName);
+
+    OMFailoverProxyProvider omFailoverProxyProvider =
+        objectStore.getClientProxy().getOMProxyProvider();
+    String currentLeaderNodeId = omFailoverProxyProvider
+        .getCurrentProxyOMNodeId();
+
+    // A read request from any proxy should failover to the current leader OM
+    for (int i = 0; i < numOfOMs; i++) {
+      // Failover OMFailoverProxyProvider to OM at index i
+      OzoneManager ozoneManager = cluster.getOzoneManager(i);
+      String omHostName = ozoneManager.getOmRpcServerAddr().getHostName();
+      int rpcPort = ozoneManager.getOmRpcServerAddr().getPort();
+
+      // Get the ObjectStore and FailoverProxyProvider for OM at index i
+      final ObjectStore store = OzoneClientFactory.getRpcClient(
+          omHostName, rpcPort, conf).getObjectStore();
+      final OMFailoverProxyProvider proxyProvider =
+          store.getClientProxy().getOMProxyProvider();
+
+      // Failover to the OM node that the objectStore points to
+      omFailoverProxyProvider.performFailoverIfRequired(
+          ozoneManager.getOMNodId());
+
+      // A read request should result in the proxyProvider failing over to
+      // leader node.
+      OzoneVolume volume = store.getVolume(volumeName);
+      Assert.assertEquals(volumeName, volume.getName());
+
+      Assert.assertEquals(currentLeaderNodeId,
+          proxyProvider.getCurrentProxyOMNodeId());
+    }
+  }
 }
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java
index 8e11a665070..fbac88256dc 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java
@@ -57,6 +57,7 @@ import org.junit.Test;
 import org.junit.rules.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sun.rmi.runtime.Log;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -335,7 +336,8 @@ public class TestScmChillMode {
     assertFalse((scm.getClientProtocolServer()).getChillModeStatus());
     final List<ContainerInfo> containers = scm.getContainerManager()
         .getContainers();
-    scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, true);
+    scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS,
+        new SCMChillModeManager.ChillModeStatus(true));
     GenericTestUtils.waitFor(() -> {
       return clientProtocolServer.getChillModeStatus();
     }, 50, 1000 * 5);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
new file mode 100644
index 00000000000..0213934a532
--- /dev/null
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
@@ -0,0 +1,218 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.hadoop.ozone.om;
+
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.security.x509.SecurityConfig;
+import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.client.OMCertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec;
+import org.apache.hadoop.hdds.security.x509.keys.KeyCodec;
+import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
+import org.apache.hadoop.test.LambdaTestUtils;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+
+import java.net.ConnectException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+import java.util.UUID;
+
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
+import static org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
+import static org.apache.hadoop.test.GenericTestUtils.*;
+
+/**
+ * Test secure Ozone Manager operation in distributed handler scenario.
+ */
+public class TestSecureOzoneManager {
+
+  private MiniOzoneCluster cluster = null;
+  private OzoneConfiguration conf;
+  private String clusterId;
+  private String scmId;
+  private String omId;
+  private Path metaDir;
+
+  @Rule
+  public Timeout timeout = new Timeout(1000 * 25);
+
+  /**
+   * Create a MiniDFSCluster for testing.
+   * <p>
+   * Ozone is made active by setting OZONE_ENABLED = true
+   */
+  @Before
+  public void init() throws Exception {
+    conf = new OzoneConfiguration();
+    clusterId = UUID.randomUUID().toString();
+    scmId = UUID.randomUUID().toString();
+    omId = UUID.randomUUID().toString();
+    conf.setBoolean(OZONE_ACL_ENABLED, true);
+    conf.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
+    conf.setInt(OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS, 2);
+    conf.set(HADOOP_SECURITY_AUTHENTICATION, KERBEROS.toString());
+    conf.set(OZONE_SCM_NAMES, "localhost");
+    final String path = getTempPath(UUID.randomUUID().toString());
+    metaDir = Paths.get(path, "om-meta");
+    conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDir.toString());
+    OzoneManager.setTestSecureOmFlag(true);
+
+  }
+
+  /**
+   * Shutdown MiniDFSCluster.
+   */
+  @After
+  public void shutdown() {
+    if (cluster != null) {
+      cluster.shutdown();
+    }
+    FileUtils.deleteQuietly(metaDir.toFile());
+  }
+
+  /**
+   * Test failure cases for secure OM initialization.
+   */
+  @Test
+  public void testSecureOmInitFailures() throws Exception {
+    PrivateKey privateKey;
+    PublicKey publicKey;
+    LogCapturer omLogs =
+        LogCapturer.captureLogs(OzoneManager.getLogger());
+    OMStorage omStorage = new OMStorage(conf);
+    omStorage.setClusterId(clusterId);
+    omStorage.setScmId(scmId);
+    omStorage.setOmId(omId);
+    omLogs.clearOutput();
+
+    // Case 1: When keypair as well as certificate is missing. Initial keypair
+    // boot-up. Get certificate will fail no SCM is not running.
+    LambdaTestUtils.intercept(ConnectException.class, "Connection " +
+            "refused; For more detail",
+        () -> OzoneManager.initializeSecurity(conf, omStorage));
+    SecurityConfig securityConfig = new SecurityConfig(conf);
+    CertificateClient client =
+        new OMCertificateClient(securityConfig);
+    privateKey = client.getPrivateKey();
+    publicKey = client.getPublicKey();
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: GETCERT"));
+    omLogs.clearOutput();
+
+    // Case 2: If key pair already exist than response should be RECOVER.
+    client = new OMCertificateClient(securityConfig);
+    LambdaTestUtils.intercept(RuntimeException.class, " OM security" +
+            " initialization failed",
+        () -> OzoneManager.initializeSecurity(conf, omStorage));
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: RECOVER"));
+    Assert.assertTrue(omLogs.getOutput().contains(" OM certificate is " +
+        "missing"));
+    omLogs.clearOutput();
+
+    // Case 3: When public key as well as certificate is missing.
+    client = new OMCertificateClient(securityConfig);
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPublicKeyFileName()).toFile());
+    LambdaTestUtils.intercept(RuntimeException.class, " OM security" +
+            " initialization failed",
+        () -> OzoneManager.initializeSecurity(conf, omStorage));
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: FAILURE"));
+    omLogs.clearOutput();
+
+    // Case 4: When private key and certificate is missing.
+    client = new OMCertificateClient(securityConfig);
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPrivateKeyFileName()).toFile());
+    KeyCodec keyCodec = new KeyCodec(securityConfig);
+    keyCodec.writePublicKey(publicKey);
+    LambdaTestUtils.intercept(RuntimeException.class, " OM security" +
+            " initialization failed",
+        () -> OzoneManager.initializeSecurity(conf, omStorage));
+    Assert.assertNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: FAILURE"));
+    omLogs.clearOutput();
+
+    // Case 5: When only certificate is present.
+    client = new OMCertificateClient(securityConfig);
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPublicKeyFileName()).toFile());
+    CertificateCodec certCodec = new CertificateCodec(securityConfig);
+    X509Certificate x509Certificate = KeyStoreTestUtil.generateCertificate(
+        "CN=Test", new KeyPair(publicKey, privateKey), 10,
+        securityConfig.getSignatureAlgo());
+    certCodec.writeCertificate(new X509CertificateHolder(
+        x509Certificate.getEncoded()));
+    LambdaTestUtils.intercept(RuntimeException.class, " OM security" +
+            " initialization failed",
+        () -> OzoneManager.initializeSecurity(conf, omStorage));
+    Assert.assertNull(client.getPrivateKey());
+    Assert.assertNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: FAILURE"));
+    omLogs.clearOutput();
+
+    // Case 6: When private key and certificate is present.
+    client = new OMCertificateClient(securityConfig);
+    FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation()
+        .toString(), securityConfig.getPublicKeyFileName()).toFile());
+    keyCodec.writePrivateKey(privateKey);
+    OzoneManager.initializeSecurity(conf, omStorage);
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: SUCCESS"));
+    omLogs.clearOutput();
+
+    // Case 7 When keypair and certificate is present.
+    client = new OMCertificateClient(securityConfig);
+    OzoneManager.initializeSecurity(conf, omStorage);
+    Assert.assertNotNull(client.getPrivateKey());
+    Assert.assertNotNull(client.getPublicKey());
+    Assert.assertNotNull(client.getCertificate());
+    Assert.assertTrue(omLogs.getOutput().contains("Init response: SUCCESS"));
+    omLogs.clearOutput();
+  }
+
+}
diff --git a/hadoop-ozone/objectstore-service/pom.xml b/hadoop-ozone/objectstore-service/pom.xml
index edb1903d13d..7a597fd43ac 100644
--- a/hadoop-ozone/objectstore-service/pom.xml
+++ b/hadoop-ozone/objectstore-service/pom.xml
@@ -65,6 +65,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     </dependency>
 
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 143a6622a2e..dfeb398ce8c 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -56,12 +56,31 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>2.2.0</version>
       <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>findbugs</artifactId>
-          <version>3.0.1</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>findbugs</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdds-server-scm</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
   <build>
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
index c571c36201f..122312daa8a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
@@ -17,6 +17,7 @@
 package org.apache.hadoop.ozone.om;
 
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.ozone.common.BlockGroup;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -67,11 +68,13 @@ public interface KeyManager {
    *
    * @param args the key to append
    * @param clientID the client requesting block.
+   * @param excludeList List of datanodes/containers to exclude during block
+   *                    allocation.
    * @return the reference to the new block.
    * @throws IOException
    */
-  OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID)
-      throws IOException;
+  OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID,
+      ExcludeList excludeList) throws IOException;
   /**
    * Given the args of a key to put, write an open key entry to meta data.
    *
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 25b335372eb..5caeaeaa2ed 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.ozone.OzoneConsts;
@@ -220,7 +221,8 @@ public class KeyManagerImpl implements KeyManager {
   }
 
   @Override
-  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID)
+  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID,
+      ExcludeList excludeList)
       throws IOException {
     Preconditions.checkNotNull(args);
     String volumeName = args.getVolumeName();
@@ -242,7 +244,7 @@ public class KeyManagerImpl implements KeyManager {
     try {
       allocatedBlock =
           scmBlockClient.allocateBlock(scmBlockSize, keyInfo.getType(),
-              keyInfo.getFactor(), omId);
+              keyInfo.getFactor(), omId, excludeList);
     } catch (SCMException ex) {
       if (ex.getResult()
           .equals(SCMException.ResultCodes.CHILL_MODE_EXCEPTION)) {
@@ -390,7 +392,8 @@ public class KeyManagerImpl implements KeyManager {
         AllocatedBlock allocatedBlock;
         try {
           allocatedBlock = scmBlockClient
-              .allocateBlock(allocateSize, type, factor, omId);
+              .allocateBlock(allocateSize, type, factor, omId,
+                  new ExcludeList());
         } catch (IOException ex) {
           if (ex instanceof SCMException) {
             if (((SCMException) ex).getResult()
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
index edcb7efd2c6..96acfb3f06d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
@@ -24,6 +24,8 @@ import static org.apache.hadoop.ozone.OzoneConsts.
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -53,6 +55,7 @@ public class OMDBCheckpointServlet extends HttpServlet {
   private static final long serialVersionUID = 1L;
 
   private transient DBStore omDbStore;
+  private transient OMMetrics omMetrics;
   private transient DataTransferThrottler throttler = null;
 
   @Override
@@ -67,6 +70,8 @@ public class OMDBCheckpointServlet extends HttpServlet {
     }
 
     omDbStore = om.getMetadataManager().getStore();
+    omMetrics = om.getMetrics();
+
     OzoneConfiguration configuration = om.getConfiguration();
     long transferBandwidth = configuration.getLongBytes(
         OMConfigKeys.OZONE_DB_CHECKPOINT_TRANSFER_RATE_KEY,
@@ -112,19 +117,38 @@ public class OMDBCheckpointServlet extends HttpServlet {
         response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         return;
       }
+      omMetrics.setLastCheckpointCreationTimeTaken(
+          checkpoint.checkpointCreationTimeTaken());
+
+      Instant start = Instant.now();
       checkPointTarFile = OmUtils.createTarFile(
           checkpoint.getCheckpointLocation());
-      LOG.info("Tar location = " + checkPointTarFile.getAbsolutePath());
+      Instant end = Instant.now();
+
+      long duration = Duration.between(start, end).toMillis();
+      LOG.debug("Time taken to archive the checkpoint : " + duration +
+          " milliseconds");
+      LOG.info("Checkpoint Tar location = " +
+          checkPointTarFile.getAbsolutePath());
+      omMetrics.setLastCheckpointTarOperationTimeTaken(duration);
+
       response.setContentType("application/x-tgz");
       response.setHeader("Content-Disposition",
           "attachment; filename=\"" +
               checkPointTarFile.getName() + "\"");
 
       checkpointFileInputStream = new FileInputStream(checkPointTarFile);
+      start = Instant.now();
       TransferFsImage.copyFileToStream(response.getOutputStream(),
           checkPointTarFile,
           checkpointFileInputStream,
           throttler);
+      end = Instant.now();
+
+      duration = Duration.between(start, end).toMillis();
+      LOG.debug("Time taken to write the checkpoint to response output " +
+          "stream: " + duration + " milliseconds");
+      omMetrics.setLastCheckpointStreamingTimeTaken(duration);
 
       checkpoint.cleanupCheckpoint();
     } catch (IOException e) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
index 2ef0aca56e8..946b89867bb 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMetrics.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.metrics2.annotation.Metric;
 import org.apache.hadoop.metrics2.annotation.Metrics;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
 
 /**
  * This class is for maintaining Ozone Manager statistics.
@@ -105,6 +106,10 @@ public class OMMetrics {
   // few minutes before restart may not be included in this count.
   private @Metric MutableCounterLong numKeys;
 
+  // Metrics to track checkpointing statistics from last run.
+  private @Metric MutableGaugeLong lastCheckpointCreationTimeTaken;
+  private @Metric MutableGaugeLong lastCheckpointTarOperationTimeTaken;
+  private @Metric MutableGaugeLong lastCheckpointStreamingTimeTaken;
 
   public OMMetrics() {
   }
@@ -390,6 +395,18 @@ public class OMMetrics {
     numGetServiceListFails.incr();
   }
 
+  public void setLastCheckpointCreationTimeTaken(long val) {
+    this.lastCheckpointCreationTimeTaken.set(val);
+  }
+
+  public void setLastCheckpointTarOperationTimeTaken(long val) {
+    this.lastCheckpointTarOperationTimeTaken.set(val);
+  }
+
+  public void setLastCheckpointStreamingTimeTaken(long val) {
+    this.lastCheckpointStreamingTimeTaken.set(val);
+  }
+
   @VisibleForTesting
   public long getNumVolumeCreates() {
     return numVolumeCreates.value();
@@ -606,6 +623,21 @@ public class OMMetrics {
     return numAbortMultipartUploadFails.value();
   }
 
+  @VisibleForTesting
+  public long getLastCheckpointCreationTimeTaken() {
+    return lastCheckpointCreationTimeTaken.value();
+  }
+
+  @VisibleForTesting
+  public long getLastCheckpointTarOperationTimeTaken() {
+    return lastCheckpointTarOperationTimeTaken.value();
+  }
+
+  @VisibleForTesting
+  public long getLastCheckpointStreamingTimeTaken() {
+    return lastCheckpointStreamingTimeTaken.value();
+  }
+
   public void unRegister() {
     MetricsSystem ms = DefaultMetricsSystem.instance();
     ms.unregisterSource(SOURCE_NAME);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 6f7d7cac186..326b12c0837 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -24,9 +24,14 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.BlockingService;
 
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.security.KeyPair;
 import java.util.Collection;
 import java.util.Objects;
+
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.crypto.key.KeyProvider;
 import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
@@ -38,7 +43,11 @@ import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol;
+import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB;
+import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolPB;
 import org.apache.hadoop.hdds.scm.ScmInfo;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
 import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolClientSideTranslatorPB;
@@ -47,6 +56,9 @@ import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolCli
 import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolPB;
 import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.client.OMCertificateClient;
+import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec;
+import org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest;
 import org.apache.hadoop.hdds.server.ServiceRuntimeInfoImpl;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
 import org.apache.hadoop.hdfs.DFSUtil;
@@ -58,6 +70,7 @@ import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.ozone.OzoneIllegalArgumentException;
 import org.apache.hadoop.ozone.OzoneSecurityUtil;
+import org.apache.hadoop.ozone.om.ha.OMFailoverProxyProvider;
 import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
 import org.apache.hadoop.ozone.security.OzoneSecurityException;
 import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
@@ -124,6 +137,7 @@ import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.utils.RetriableTask;
 import org.apache.ratis.util.LifeCycle;
+import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -148,8 +162,9 @@ import java.util.concurrent.TimeUnit;
 
 import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForBlockClients;
 import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients;
-import static org.apache.hadoop.hdds.HddsUtils.isHddsEnabled;
+import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForSecurityProtocol;
 import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState.HEALTHY;
+import static org.apache.hadoop.hdds.security.x509.certificates.utils.CertificateSignRequest.getEncodedString;
 import static org.apache.hadoop.hdds.server.ServerUtils.updateRPCListenAddress;
 import static org.apache.hadoop.io.retry.RetryPolicies.retryUpToMaximumCountWithFixedSleep;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS;
@@ -157,8 +172,8 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED_DEFAULT;
 import static org.apache.hadoop.ozone.OzoneConsts.OM_METRICS_FILE;
 import static org.apache.hadoop.ozone.OzoneConsts.OM_METRICS_TEMP_FILE;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
 
+import static org.apache.hadoop.ozone.OzoneConsts.RPC_PORT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
 import static org.apache.hadoop.ozone.om.OMConfigKeys
     .OZONE_OM_HANDLER_COUNT_DEFAULT;
@@ -244,6 +259,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   private final SecurityConfig secConfig;
   private final S3SecretManager s3SecretManager;
   private volatile boolean isOmRpcServerRunning = false;
+  private String omComponent;
 
   private KeyProviderCryptoExtension kmsProvider = null;
   private static String keyProviderUriKeyName =
@@ -289,12 +305,14 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     omRpcAddressTxt = new Text(omNodeDetails.getRpcAddressString());
 
     secConfig = new SecurityConfig(configuration);
+    if (secConfig.isSecurityEnabled()) {
+      omComponent = OM_DAEMON + "-" + omId;
+      certClient = new OMCertificateClient(new SecurityConfig(conf));
+      delegationTokenMgr = createDelegationTokenSecretManager(configuration);
+    }
     if (secConfig.isBlockTokenEnabled()) {
       blockTokenMgr = createBlockTokenSecretManager(configuration);
     }
-    if(secConfig.isSecurityEnabled()){
-      delegationTokenMgr = createDelegationTokenSecretManager(configuration);
-    }
 
     omRpcServer = getRpcServer(conf);
     omRpcAddress = updateRPCListenAddress(configuration,
@@ -666,11 +684,17 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
    */
   private void readKeyPair() throws OzoneSecurityException {
     try {
-      keyPair = new KeyPair(certClient.getPublicKey(),
-          certClient.getPrivateKey());
+      LOG.info("Reading keypair and certificate from file system.");
+      PublicKey pubKey = certClient.getPublicKey();
+      PrivateKey pvtKey = certClient.getPrivateKey();
+      Objects.requireNonNull(pubKey);
+      Objects.requireNonNull(pvtKey);
+      Objects.requireNonNull(certClient.getCertificate());
+
+      keyPair = new KeyPair(pubKey, pvtKey);
     } catch (Exception e) {
-      throw new OzoneSecurityException("Error reading private file for "
-          + "OzoneManager", e, OzoneSecurityException
+      throw new OzoneSecurityException("Error reading keypair & certificate "
+          + "OzoneManager.", e, OzoneSecurityException
           .ResultCodes.OM_PUBLIC_PRIVATE_KEY_FILE_NOT_EXIST);
     }
   }
@@ -728,6 +752,29 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
         .createProxy(scmBlockLocationClient, ScmBlockLocationProtocol.class);
   }
 
+  /**
+   * Create a scm security client, used to get SCM signed certificate.
+   *
+   * @return {@link SCMSecurityProtocol}
+   * @throws IOException
+   */
+  private static SCMSecurityProtocol getScmSecurityClient(
+      OzoneConfiguration conf) throws IOException {
+    RPC.setProtocolEngine(conf, SCMSecurityProtocolPB.class,
+        ProtobufRpcEngine.class);
+    long scmVersion =
+        RPC.getProtocolVersion(ScmBlockLocationProtocolPB.class);
+    InetSocketAddress scmSecurityProtoAdd =
+        getScmAddressForSecurityProtocol(conf);
+    SCMSecurityProtocolClientSideTranslatorPB scmSecurityClient =
+        new SCMSecurityProtocolClientSideTranslatorPB(
+            RPC.getProxy(SCMSecurityProtocolPB.class, scmVersion,
+                scmSecurityProtoAdd, UserGroupInformation.getCurrentUser(),
+                conf, NetUtils.getDefaultSocketFactory(conf),
+                Client.getRpcTimeout(conf)));
+    return scmSecurityClient;
+  }
+
   /**
    * Returns a scm container client.
    *
@@ -857,11 +904,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   private static OzoneManager createOm(String[] argv,
       OzoneConfiguration conf, boolean printBanner)
       throws IOException, AuthenticationException {
-    if (!isHddsEnabled(conf)) {
-      System.err.println("OM cannot be started in secure mode or when " +
-          OZONE_ENABLED + " is set to false");
-      System.exit(1);
-    }
     StartupOption startOpt = parseArguments(argv);
     if (startOpt == null) {
       printUsage(System.err);
@@ -926,6 +968,11 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
             "OM initialization succeeded.Current cluster id for sd="
                 + omStorage.getStorageDir() + ";cid=" + omStorage
                 .getClusterID());
+
+        if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+          initializeSecurity(conf, omStorage);
+        }
+
         return true;
       } catch (IOException ioe) {
         LOG.error("Could not initialize OM version file", ioe);
@@ -940,6 +987,41 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     }
   }
 
+  /**
+   * Initializes secure OzoneManager.
+   * */
+  @VisibleForTesting
+  public static void initializeSecurity(OzoneConfiguration conf,
+      OMStorage omStore)
+      throws IOException {
+    LOG.info("Initializing secure OzoneManager.");
+
+    CertificateClient certClient =
+        new OMCertificateClient(new SecurityConfig(conf));
+    CertificateClient.InitResponse response = certClient.init();
+    LOG.info("Init response: {}", response);
+    switch (response) {
+    case SUCCESS:
+      LOG.info("Initialization successful.");
+      break;
+    case GETCERT:
+      getSCMSignedCert(certClient, conf, omStore);
+      LOG.info("Successfully stored SCM signed certificate.");
+      break;
+    case FAILURE:
+      LOG.error("OM security initialization failed.");
+      throw new RuntimeException("OM security initialization failed.");
+    case RECOVER:
+      LOG.error("OM security initialization failed. OM certificate is " +
+          "missing.");
+      throw new RuntimeException("OM security initialization failed.");
+    default:
+      LOG.error("OM security initialization failed. Init response: {}",
+          response);
+      throw new RuntimeException("OM security initialization failed.");
+    }
+  }
+
   private static ScmInfo getScmInfo(OzoneConfiguration conf)
       throws IOException {
     try {
@@ -1049,8 +1131,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     DefaultMetricsSystem.initialize("OzoneManager");
 
     metadataManager.start(configuration);
-    // TODO: uncomment this with HDDS-134 to avoid NPE
-    //startSecretManagerIfNecessary();
+    startSecretManagerIfNecessary();
 
     // Set metrics and start metrics back ground thread
     metrics.setNumVolumes(metadataManager.countRowsInTable(metadataManager
@@ -1155,8 +1236,8 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
         ProtobufRpcEngine.class);
 
     BlockingService omService = newReflectiveBlockingService(
-        new OzoneManagerProtocolServerSideTranslatorPB(this, omRatisClient,
-            isRatisEnabled));
+        new OzoneManagerProtocolServerSideTranslatorPB(this, omRatisServer,
+            omRatisClient, isRatisEnabled));
     return startRpcServer(configuration, omNodeRpcAddr,
         OzoneManagerProtocolPB.class, omService,
         handlerCount);
@@ -1264,6 +1345,65 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     }
   }
 
+  /**
+   * Get SCM signed certificate and store it using certificate client.
+   * */
+  private static void getSCMSignedCert(CertificateClient client,
+      OzoneConfiguration config, OMStorage omStore) throws IOException {
+    CertificateSignRequest.Builder builder = client.getCSRBuilder();
+    KeyPair keyPair = new KeyPair(client.getPublicKey(),
+        client.getPrivateKey());
+    InetSocketAddress omRpcAdd;
+
+    omRpcAdd = OmUtils.getOmAddress(config);
+    // Get host name.
+    String hostname = omRpcAdd.getAddress().getHostName();
+
+    String subject = UserGroupInformation.getCurrentUser()
+        .getShortUserName() + "@" + hostname;
+
+    builder.setCA(false)
+        .setKey(keyPair)
+        .setConfiguration(config)
+        .setScmID(omStore.getScmId())
+        .setClusterID(omStore.getClusterID())
+        .setSubject(subject)
+        .addIpAddress(omRpcAdd.getAddress().getHostAddress());
+
+    LOG.info("Creating csr for OM->dns:{},ip:{},scmId:{},clusterId:{}," +
+            "subject:{}", hostname, omRpcAdd.getAddress().getHostAddress(),
+        omStore.getScmId(), omStore.getClusterID(), subject);
+
+    HddsProtos.OzoneManagerDetailsProto.Builder omDetailsProtoBuilder =
+        HddsProtos.OzoneManagerDetailsProto.newBuilder()
+            .setHostName(omRpcAdd.getHostName())
+            .setIpAddress(omRpcAdd.getAddress().getHostAddress())
+            .setUuid(omStore.getOmId())
+            .addPorts(HddsProtos.Port.newBuilder()
+                .setName(RPC_PORT)
+                .setValue(omRpcAdd.getPort())
+                .build());
+
+    PKCS10CertificationRequest csr = builder.build();
+    HddsProtos.OzoneManagerDetailsProto omDetailsProto =
+        omDetailsProtoBuilder.build();
+    LOG.info("OzoneManager ports added:{}", omDetailsProto.getPortsList());
+    SCMSecurityProtocol secureScmClient = getScmSecurityClient(config);
+
+    String pemEncodedCert = secureScmClient.getOMCertificate(omDetailsProto,
+        getEncodedString(csr));
+
+    try {
+      X509Certificate x509Certificate =
+          CertificateCodec.getX509Cert(pemEncodedCert);
+      client.storeCertificate(x509Certificate);
+    } catch (IOException | CertificateException e) {
+      LOG.error("Error while storing SCM signed certificate.", e);
+      throw new RuntimeException(e);
+    }
+
+  }
+
   /**
    *
    * @return true if delegation token operation is allowed
@@ -1866,7 +2006,8 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   }
 
   @Override
-  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID)
+  public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID,
+      ExcludeList excludeList)
       throws IOException {
     if(isAclEnabled) {
       checkAcls(ResourceType.KEY, StoreType.OZONE, ACLType.WRITE,
@@ -1878,7 +2019,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
     auditMap.put(OzoneConsts.CLIENT_ID, String.valueOf(clientID));
     try {
       metrics.incNumBlockAllocateCalls();
-      return keyManager.allocateBlock(args, clientID);
+      return keyManager.allocateBlock(args, clientID, excludeList);
     } catch (Exception ex) {
       metrics.incNumBlockAllocateCallFails();
       auditSuccess = false;
@@ -2461,4 +2602,18 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   public List<OMNodeDetails> getPeerNodes() {
     return peerNodes;
   }
+
+  @VisibleForTesting
+  public CertificateClient getCertificateClient() {
+    return certClient;
+  }
+
+  public String getComponent() {
+    return omComponent;
+  }
+
+  @Override
+  public OMFailoverProxyProvider getOMFailoverProxyProvider() {
+    return null;
+  }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
index 9e1cafc30c9..c9c48a4422c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisClient.java
@@ -23,10 +23,14 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.ServiceException;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.helpers.OMRatisHelper;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
@@ -53,24 +57,24 @@ public final class OzoneManagerRatisClient implements Closeable {
       OzoneManagerRatisClient.class);
 
   private final RaftGroup raftGroup;
-  private final String omID;
+  private final String omNodeID;
   private final RpcType rpcType;
   private RaftClient raftClient;
   private final RetryPolicy retryPolicy;
   private final Configuration conf;
 
-  private OzoneManagerRatisClient(String omId, RaftGroup raftGroup,
+  private OzoneManagerRatisClient(String omNodeId, RaftGroup raftGroup,
       RpcType rpcType, RetryPolicy retryPolicy,
       Configuration config) {
     this.raftGroup = raftGroup;
-    this.omID = omId;
+    this.omNodeID = omNodeId;
     this.rpcType = rpcType;
     this.retryPolicy = retryPolicy;
     this.conf = config;
   }
 
   public static OzoneManagerRatisClient newOzoneManagerRatisClient(
-      String omId, RaftGroup raftGroup, Configuration conf) {
+      String omNodeId, RaftGroup raftGroup, Configuration conf) {
     final String rpcType = conf.get(
         OMConfigKeys.OZONE_OM_RATIS_RPC_TYPE_KEY,
         OMConfigKeys.OZONE_OM_RATIS_RPC_TYPE_DEFAULT);
@@ -87,19 +91,19 @@ public final class OzoneManagerRatisClient implements Closeable {
     final RetryPolicy retryPolicy = RetryPolicies
         .retryUpToMaximumCountWithFixedSleep(maxRetryCount, sleepDuration);
 
-    return new OzoneManagerRatisClient(omId, raftGroup,
+    return new OzoneManagerRatisClient(omNodeId, raftGroup,
         SupportedRpcType.valueOfIgnoreCase(rpcType), retryPolicy, conf);
   }
 
   public void connect() {
     LOG.debug("Connecting to OM Ratis Server GroupId:{} OM:{}",
-        raftGroup.getGroupId().getUuid().toString(), omID);
+        raftGroup.getGroupId().getUuid().toString(), omNodeID);
 
     // TODO : XceiverClient ratis should pass the config value of
     // maxOutstandingRequests so as to set the upper bound on max no of async
     // requests to be handled by raft client
 
-    raftClient = OMRatisHelper.newRaftClient(rpcType, omID, raftGroup,
+    raftClient = OMRatisHelper.newRaftClient(rpcType, omNodeID, raftGroup,
         retryPolicy, conf);
   }
 
@@ -119,13 +123,12 @@ public final class OzoneManagerRatisClient implements Closeable {
    * @param request Request
    * @return Response to the command
    */
-  public OMResponse sendCommand(OMRequest request) {
+  public OMResponse sendCommand(OMRequest request) throws ServiceException {
     try {
       CompletableFuture<OMResponse> reply = sendCommandAsync(request);
       return reply.get();
     } catch (ExecutionException | InterruptedException e) {
-      LOG.error("Failed to execute command: " + request, e);
-      return OMRatisHelper.getErrorResponse(request.getCmdType(), e);
+      throw new ServiceException(e);
     }
   }
 
@@ -152,9 +155,10 @@ public final class OzoneManagerRatisClient implements Closeable {
                 if (raftRetryFailureException != null) {
                   throw new CompletionException(raftRetryFailureException);
                 }
+
                 OMResponse response = OMRatisHelper
-                    .convertByteStringToOMResponse(reply.getMessage()
-                        .getContent());
+                    .getOMResponseFromRaftClientReply(reply);
+
                 return response;
               } catch (InvalidProtocolBufferException e) {
                 throw new CompletionException(e);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index e03293a8f14..a3cde3e9d52 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -27,8 +27,13 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.StorageUnit;
@@ -41,6 +46,11 @@ import org.apache.ratis.client.RaftClientConfigKeys;
 import org.apache.ratis.conf.RaftProperties;
 import org.apache.ratis.grpc.GrpcConfigKeys;
 import org.apache.ratis.netty.NettyConfigKeys;
+import org.apache.ratis.proto.RaftProtos.RoleInfoProto;
+import org.apache.ratis.proto.RaftProtos.RaftPeerRole;
+import org.apache.ratis.protocol.ClientId;
+import org.apache.ratis.protocol.GroupInfoReply;
+import org.apache.ratis.protocol.GroupInfoRequest;
 import org.apache.ratis.protocol.RaftGroup;
 import org.apache.ratis.protocol.RaftGroupId;
 import org.apache.ratis.protocol.RaftPeer;
@@ -50,6 +60,7 @@ import org.apache.ratis.rpc.SupportedRpcType;
 import org.apache.ratis.server.RaftServer;
 import org.apache.ratis.server.RaftServerConfigKeys;
 import org.apache.ratis.statemachine.impl.BaseStateMachine;
+import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
 import org.apache.ratis.util.LifeCycle;
 import org.apache.ratis.util.SizeInBytes;
 import org.apache.ratis.util.TimeDuration;
@@ -69,7 +80,22 @@ public final class OzoneManagerRatisServer {
   private final RaftGroupId raftGroupId;
   private final RaftGroup raftGroup;
   private final RaftPeerId raftPeerId;
+
   private final OzoneManagerProtocol ozoneManager;
+  private final ClientId clientId = ClientId.randomId();
+
+  private final ScheduledExecutorService scheduledRoleChecker;
+  private long roleCheckInitialDelayMs = 1000; // 1 second default
+  private long roleCheckIntervalMs;
+  private ReentrantReadWriteLock roleCheckLock = new ReentrantReadWriteLock();
+  private Optional<RaftPeerRole> cachedPeerRole = Optional.empty();
+  private Optional<RaftPeerId> cachedLeaderPeerId = Optional.empty();
+
+  private static final AtomicLong CALL_ID_COUNTER = new AtomicLong();
+
+  private static long nextCallId() {
+    return CALL_ID_COUNTER.getAndIncrement() & Long.MAX_VALUE;
+  }
 
   /**
    * Returns an OM Ratis server.
@@ -108,6 +134,20 @@ public final class OzoneManagerRatisServer {
         .setProperties(serverProperties)
         .setStateMachine(getStateMachine(this.raftGroupId))
         .build();
+
+    // Run a scheduler to check and update the server role on the leader
+    // periodically
+    this.scheduledRoleChecker = Executors.newSingleThreadScheduledExecutor();
+    this.scheduledRoleChecker.scheduleWithFixedDelay(new Runnable() {
+      @Override
+      public void run() {
+        // Run this check only on the leader OM
+        if (cachedPeerRole.isPresent() &&
+            cachedPeerRole.get() == RaftPeerRole.LEADER) {
+          updateServerRole();
+        }
+      }
+    }, roleCheckInitialDelayMs, roleCheckIntervalMs, TimeUnit.MILLISECONDS);
   }
 
   /**
@@ -156,7 +196,11 @@ public final class OzoneManagerRatisServer {
    * Returns OzoneManager StateMachine.
    */
   private BaseStateMachine getStateMachine(RaftGroupId gid) {
-    return  new OzoneManagerStateMachine(ozoneManager);
+    return  new OzoneManagerStateMachine(this);
+  }
+
+  public OzoneManagerProtocol getOzoneManager() {
+    return ozoneManager;
   }
 
   /**
@@ -323,6 +367,19 @@ public final class OzoneManagerRatisServer {
     RaftServerConfigKeys.Rpc.setSlownessTimeout(properties,
         nodeFailureTimeout);
 
+    TimeUnit roleCheckIntervalUnit =
+        OMConfigKeys.OZONE_OM_RATIS_SERVER_ROLE_CHECK_INTERVAL_DEFAULT
+            .getUnit();
+    long roleCheckIntervalDuration = conf.getTimeDuration(
+        OMConfigKeys.OZONE_OM_RATIS_SERVER_ROLE_CHECK_INTERVAL_KEY,
+        OMConfigKeys.OZONE_OM_RATIS_SERVER_ROLE_CHECK_INTERVAL_DEFAULT
+            .getDuration(), nodeFailureTimeoutUnit);
+    this.roleCheckIntervalMs = TimeDuration.valueOf(
+        roleCheckIntervalDuration, roleCheckIntervalUnit)
+        .toLong(TimeUnit.MILLISECONDS);
+    this.roleCheckInitialDelayMs = leaderElectionMinTimeout
+        .toLong(TimeUnit.MILLISECONDS);
+
     /**
      * TODO: when ratis snapshots are implemented, set snapshot threshold and
      * queue size.
@@ -331,6 +388,104 @@ public final class OzoneManagerRatisServer {
     return properties;
   }
 
+  /**
+   * Check the cached leader status.
+   * @return true if cached role is Leader, false otherwise.
+   */
+  private boolean checkCachedPeerRoleIsLeader() {
+    this.roleCheckLock.readLock().lock();
+    try {
+      if (cachedPeerRole.isPresent() &&
+          cachedPeerRole.get() == RaftPeerRole.LEADER) {
+        return true;
+      }
+      return false;
+    } finally {
+      this.roleCheckLock.readLock().unlock();
+    }
+  }
+
+  /**
+   * Check if the current OM node is the leader node.
+   * @return true if Leader, false otherwise.
+   */
+  public boolean isLeader() {
+    if (checkCachedPeerRoleIsLeader()) {
+      return true;
+    }
+
+    // Get the server role from ratis server and update the cached values.
+    updateServerRole();
+
+    // After updating the server role, check and return if leader or not.
+    return checkCachedPeerRoleIsLeader();
+  }
+
+  /**
+   * Get the suggested leader peer id.
+   * @return RaftPeerId of the suggested leader node.
+   */
+  public Optional<RaftPeerId> getCachedLeaderPeerId() {
+    this.roleCheckLock.readLock().lock();
+    try {
+      return cachedLeaderPeerId;
+    } finally {
+      this.roleCheckLock.readLock().unlock();
+    }
+  }
+
+  /**
+   * Get the gorup info (peer role and leader peer id) from Ratis server and
+   * update the OM server role.
+   */
+  public void updateServerRole() {
+    try {
+      GroupInfoReply groupInfo = getGroupInfo();
+      RoleInfoProto roleInfoProto = groupInfo.getRoleInfoProto();
+      RaftPeerRole thisNodeRole = roleInfoProto.getRole();
+
+      if (thisNodeRole.equals(RaftPeerRole.LEADER)) {
+        setServerRole(thisNodeRole, raftPeerId);
+
+      } else if (thisNodeRole.equals(RaftPeerRole.FOLLOWER)) {
+        ByteString leaderNodeId = roleInfoProto.getFollowerInfo()
+            .getLeaderInfo().getId().getId();
+        RaftPeerId leaderPeerId = RaftPeerId.valueOf(leaderNodeId);
+
+        setServerRole(thisNodeRole, leaderPeerId);
+
+      } else {
+        setServerRole(thisNodeRole, null);
+
+      }
+    } catch (IOException e) {
+      LOG.error("Failed to retrieve RaftPeerRole. Setting cached role to " +
+          "{} and resetting leader info.", RaftPeerRole.UNRECOGNIZED, e);
+      setServerRole(null, null);
+    }
+  }
+
+  /**
+   * Set the current server role and the leader peer id.
+   */
+  private void setServerRole(RaftPeerRole currentRole,
+      RaftPeerId leaderPeerId) {
+    this.roleCheckLock.writeLock().lock();
+    try {
+      this.cachedPeerRole = Optional.ofNullable(currentRole);
+      this.cachedLeaderPeerId = Optional.ofNullable(leaderPeerId);
+    } finally {
+      this.roleCheckLock.writeLock().unlock();
+    }
+  }
+
+  private GroupInfoReply getGroupInfo() throws IOException {
+    GroupInfoRequest groupInfoRequest = new GroupInfoRequest(clientId,
+        raftPeerId, raftGroupId, nextCallId());
+    GroupInfoReply groupInfo = server.getGroupInfo(groupInfoRequest);
+    return groupInfo;
+  }
+
   public int getServerPort() {
     return port;
   }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
index 701ac16de17..acbbd34ac85 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
@@ -20,10 +20,12 @@ package org.apache.hadoop.ozone.om.ratis;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.ServiceException;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import org.apache.hadoop.ozone.container.common.transport.server.ratis
     .ContainerStateMachine;
 import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.OMRatisHelper;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .OMRequest;
@@ -54,11 +56,15 @@ public class OzoneManagerStateMachine extends BaseStateMachine {
       LoggerFactory.getLogger(ContainerStateMachine.class);
   private final SimpleStateMachineStorage storage =
       new SimpleStateMachineStorage();
+  private final OzoneManagerRatisServer omRatisServer;
+  private final OzoneManagerProtocol ozoneManager;
   private final OzoneManagerRequestHandler handler;
   private RaftGroupId raftGroupId;
 
-  public OzoneManagerStateMachine(OzoneManagerProtocol om) {
-    this.handler = new OzoneManagerRequestHandler(om);
+  public OzoneManagerStateMachine(OzoneManagerRatisServer ratisServer) {
+    this.omRatisServer = ratisServer;
+    this.ozoneManager = omRatisServer.getOzoneManager();
+    this.handler = new OzoneManagerRequestHandler(ozoneManager);
   }
 
   /**
@@ -137,6 +143,15 @@ public class OzoneManagerStateMachine extends BaseStateMachine {
     }
   }
 
+  /**
+   * Notifies the state machine that the raft peer is no longer leader.
+   */
+  @Override
+  public void notifyNotLeader(Collection<TransactionContext> pendingEntries)
+      throws IOException {
+    omRatisServer.updateServerRole();
+  }
+
   /**
    * Submits request to OM and returns the response Message.
    * @param request OMRequest
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
index 5684fa561b3..395cc42388c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
@@ -17,18 +17,24 @@
 package org.apache.hadoop.ozone.protocolPB;
 
 import org.apache.hadoop.hdds.tracing.TracingUtil;
+import org.apache.hadoop.ozone.OmUtils;
+import org.apache.hadoop.ozone.om.exceptions.NotLeaderException;
 import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
 import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
 import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisClient;
+import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
 import io.opentracing.Scope;
+import org.apache.ratis.protocol.RaftPeerId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 /**
  * This class is the server-side translator that forwards requests received on
  * {@link OzoneManagerProtocolPB}
@@ -38,6 +44,7 @@ public class OzoneManagerProtocolServerSideTranslatorPB implements
     OzoneManagerProtocolPB {
   private static final Logger LOG = LoggerFactory
       .getLogger(OzoneManagerProtocolServerSideTranslatorPB.class);
+  private final OzoneManagerRatisServer omRatisServer;
   private final OzoneManagerRatisClient omRatisClient;
   private final OzoneManagerRequestHandler handler;
   private final boolean isRatisEnabled;
@@ -48,9 +55,10 @@ public class OzoneManagerProtocolServerSideTranslatorPB implements
    * @param impl OzoneManagerProtocolPB
    */
   public OzoneManagerProtocolServerSideTranslatorPB(
-      OzoneManagerProtocol impl, OzoneManagerRatisClient ratisClient,
-      boolean enableRatis) {
+      OzoneManagerProtocol impl, OzoneManagerRatisServer ratisServer,
+      OzoneManagerRatisClient ratisClient, boolean enableRatis) {
     handler = new OzoneManagerRequestHandler(impl);
+    this.omRatisServer = ratisServer;
     this.omRatisClient = ratisClient;
     this.isRatisEnabled = enableRatis;
   }
@@ -68,7 +76,12 @@ public class OzoneManagerProtocolServerSideTranslatorPB implements
             request.getTraceID());
     try {
       if (isRatisEnabled) {
-        return submitRequestToRatis(request);
+        // Check if the request is a read only request
+        if (OmUtils.isReadOnly(request)) {
+          return submitReadRequestToOM(request);
+        } else {
+          return submitRequestToRatis(request);
+        }
       } else {
         return submitRequestDirectlyToOM(request);
       }
@@ -80,10 +93,37 @@ public class OzoneManagerProtocolServerSideTranslatorPB implements
   /**
    * Submits request to OM's Ratis server.
    */
-  private OMResponse submitRequestToRatis(OMRequest request) {
+  private OMResponse submitRequestToRatis(OMRequest request)
+      throws ServiceException {
     return omRatisClient.sendCommand(request);
   }
 
+  private OMResponse submitReadRequestToOM(OMRequest request)
+      throws ServiceException {
+    // Check if this OM is the leader.
+    if (omRatisServer.isLeader()) {
+      return handler.handle(request);
+    } else {
+      RaftPeerId raftPeerId = omRatisServer.getRaftPeerId();
+      Optional<RaftPeerId> leaderRaftPeerId = omRatisServer
+          .getCachedLeaderPeerId();
+
+      NotLeaderException notLeaderException;
+      if (leaderRaftPeerId.isPresent()) {
+        notLeaderException = new NotLeaderException(raftPeerId.toString());
+      } else {
+        notLeaderException = new NotLeaderException(
+            raftPeerId.toString(), leaderRaftPeerId.toString());
+      }
+
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(notLeaderException.getMessage());
+      }
+
+      throw new ServiceException(notLeaderException);
+    }
+  }
+
   /**
    * Submits request directly to OM.
    */
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
index 831873d9cb8..8d768421248 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
@@ -24,6 +24,7 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.helpers.OmBucketArgs;
@@ -626,8 +627,9 @@ public class OzoneManagerRequestHandler {
         .setBucketName(keyArgs.getBucketName())
         .setKeyName(keyArgs.getKeyName())
         .build();
-    OmKeyLocationInfo newLocation = impl.allocateBlock(omKeyArgs,
-        request.getClientID());
+    OmKeyLocationInfo newLocation =
+        impl.allocateBlock(omKeyArgs, request.getClientID(),
+            ExcludeList.getFromProtoBuf(request.getExcludeList()));
     resp.setKeyLocation(newLocation.getProtobuf());
 
     return resp.build();
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ScmBlockLocationTestIngClient.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ScmBlockLocationTestIngClient.java
index 3b9c232776f..6ff927bf591 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ScmBlockLocationTestIngClient.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ScmBlockLocationTestIngClient.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hdds.scm.ScmInfo;
 import org.apache.hadoop.hdds.scm.TestUtils;
 import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
 import org.apache.hadoop.hdds.scm.container.common.helpers.DeleteBlockResult;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
@@ -108,13 +109,14 @@ public class ScmBlockLocationTestIngClient implements ScmBlockLocationProtocol {
    * @param type Replication Type
    * @param factor - Replication factor
    * @param owner - String owner.
+   * @param excludeList list of dns/pipelines to exclude
    * @return
    * @throws IOException
    */
   @Override
   public AllocatedBlock allocateBlock(long size,
       HddsProtos.ReplicationType type, HddsProtos.ReplicationFactor factor,
-      String owner) throws IOException {
+      String owner, ExcludeList excludeList) throws IOException {
     DatanodeDetails datanodeDetails = TestUtils.randomDatanodeDetails();
     Pipeline pipeline = createPipeline(datanodeDetails);
     long containerID = Time.monotonicNow();
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
index c86c12a8811..ab846b85f8a 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.server.ServerUtils;
 import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
@@ -196,7 +197,8 @@ public class TestKeyDeletingService {
       //Open, Commit and Delete the Keys in the Key Manager.
       OpenKeySession session = keyManager.openKey(arg);
       for (int i = 0; i < numBlocks; i++) {
-        arg.addLocationInfo(keyManager.allocateBlock(arg, session.getId()));
+        arg.addLocationInfo(
+            keyManager.allocateBlock(arg, session.getId(), new ExcludeList()));
       }
       keyManager.commitKey(arg, session.getId());
       keyManager.deleteKey(arg);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
index 4531dbbfa32..992ccafba26 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException;
 import org.apache.hadoop.hdds.scm.exceptions.SCMException.ResultCodes;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
@@ -91,7 +92,8 @@ public class TestKeyManagerImpl {
   private void setupMocks() throws Exception {
     Mockito.when(scmBlockLocationProtocol
         .allocateBlock(Mockito.anyLong(), Mockito.any(ReplicationType.class),
-            Mockito.any(ReplicationFactor.class), Mockito.anyString()))
+            Mockito.any(ReplicationFactor.class), Mockito.anyString(),
+            Mockito.any(ExcludeList.class)))
         .thenThrow(
             new SCMException("ChillModePrecheck failed for allocateBlock",
                 ResultCodes.CHILL_MODE_EXCEPTION));
@@ -180,7 +182,7 @@ public class TestKeyManagerImpl {
         .setVolumeName(VOLUME_NAME).build();
     LambdaTestUtils.intercept(OMException.class,
         "ChillModePrecheck failed for allocateBlock", () -> {
-          keyManager.allocateBlock(keyArgs, 1);
+          keyManager.allocateBlock(keyArgs, 1, new ExcludeList());
         });
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
index 83d2245b40d..8a8be357c8f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
@@ -34,8 +34,6 @@ import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.OMNodeDetails;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
     .OMRequest;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
-    .OMResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.ratis.protocol.RaftGroupId;
@@ -109,27 +107,6 @@ public class TestOzoneManagerRatisServer {
         LifeCycle.State.RUNNING, omRatisServer.getServerState());
   }
 
-  /**
-   * Submit any request to OM Ratis server and check that the dummy response
-   * message is received.
-   */
-  @Test
-  public void testSubmitRatisRequest() throws Exception {
-    // Wait for leader election
-    Thread.sleep(LEADER_ELECTION_TIMEOUT * 2);
-    OMRequest request = OMRequest.newBuilder()
-        .setCmdType(OzoneManagerProtocolProtos.Type.CreateVolume)
-        .setClientId(clientId)
-        .build();
-
-    OMResponse response = omRatisClient.sendCommand(request);
-
-    Assert.assertEquals(OzoneManagerProtocolProtos.Type.CreateVolume,
-        response.getCmdType());
-    Assert.assertEquals(false, response.getSuccess());
-    Assert.assertEquals(false, response.hasCreateVolumeResponse());
-  }
-
   /**
    * Test that all of {@link OzoneManagerProtocolProtos.Type} enum values are
    * categorized in {@link OmUtils#isReadOnly(OMRequest)}.
diff --git a/hadoop-ozone/ozone-recon/pom.xml b/hadoop-ozone/ozone-recon/pom.xml
new file mode 100644
index 00000000000..c8bff4ca898
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>hadoop-ozone</artifactId>
+    <groupId>org.apache.hadoop</groupId>
+    <version>0.4.0-SNAPSHOT</version>
+  </parent>
+  <name>Apache Hadoop Ozone Recon</name>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>hadoop-ozone-recon</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-ozone-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-servlet</artifactId>
+      <version>4.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet-core</artifactId>
+      <version>2.27</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-assistedinject</artifactId>
+      <version>4.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/OzoneConfigurationProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/OzoneConfigurationProvider.java
new file mode 100644
index 00000000000..3c8dae04c16
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/OzoneConfigurationProvider.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+
+import com.google.inject.Provider;
+
+/**
+ * Ozone Configuration Provider.
+ * <p>
+ * As the OzoneConfiguration is created by the CLI application here we inject
+ * it via a singleton instance to the Jax-RS/CDI instances.
+ */
+public class OzoneConfigurationProvider implements
+    Provider<OzoneConfiguration> {
+
+  private static OzoneConfiguration configuration;
+
+  static void setConfiguration(OzoneConfiguration conf) {
+    OzoneConfigurationProvider.configuration = conf;
+  }
+
+  @Override
+  public OzoneConfiguration get() {
+    return configuration;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconApplication.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconApplication.java
new file mode 100644
index 00000000000..24ba5ee6c75
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconApplication.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+/**
+ * JaxRS resource definition.
+ */
+public class ReconApplication extends ResourceConfig {
+  public ReconApplication() {
+    packages("org.apache.hadoop.ozone.recon.api");
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconConstants.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconConstants.java
new file mode 100644
index 00000000000..1ea132a0ffa
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconConstants.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon;
+
+import static org.apache.hadoop.ozone.OzoneConsts.CONTAINER_DB_SUFFIX;
+
+/**
+ * Recon Server constants file.
+ */
+public final class ReconConstants {
+
+  private ReconConstants() {
+    // Never Constructed
+  }
+
+  public static final String RECON_CONTAINER_DB = "recon-" +
+      CONTAINER_DB_SUFFIX;
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconControllerModule.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconControllerModule.java
new file mode 100644
index 00000000000..f282b9a7bae
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconControllerModule.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.recon.spi.ReconContainerDBProvider;
+import org.apache.hadoop.ozone.recon.spi.ContainerDBServiceProvider;
+import org.apache.hadoop.ozone.recon.spi.impl.ContainerDBServiceProviderImpl;
+import org.apache.hadoop.utils.MetadataStore;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+
+/**
+ * Guice controller that defines concrete bindings.
+ */
+public class ReconControllerModule extends AbstractModule {
+  @Override
+  protected void configure() {
+    bind(OzoneConfiguration.class).toProvider(OzoneConfigurationProvider.class);
+    bind(ReconHttpServer.class).in(Singleton.class);
+    bind(MetadataStore.class).toProvider(ReconContainerDBProvider.class);
+    bind(ContainerDBServiceProvider.class)
+        .to(ContainerDBServiceProviderImpl.class);
+  }
+
+
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconHttpServer.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconHttpServer.java
new file mode 100644
index 00000000000..e7dcb0cc4d6
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconHttpServer.java
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hdds.server.BaseHttpServer;
+
+import com.google.inject.Inject;
+
+/**
+ * Recon http server with recon supplied config defaults.
+ */
+
+public class ReconHttpServer extends BaseHttpServer {
+
+  @Inject
+  ReconHttpServer(Configuration conf) throws IOException {
+    super(conf, "recon");
+  }
+
+  @Override
+  protected String getHttpAddressKey() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTP_ADDRESS_KEY;
+  }
+
+  @Override
+  protected String getHttpsAddressKey() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTPS_ADDRESS_KEY;
+  }
+
+  @Override
+  protected String getHttpBindHostKey() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTP_BIND_HOST_KEY;
+  }
+
+  @Override
+  protected String getHttpsBindHostKey() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTPS_BIND_HOST_KEY;
+  }
+
+  @Override
+  protected String getBindHostDefault() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTP_BIND_HOST_DEFAULT;
+  }
+
+  @Override
+  protected int getHttpBindPortDefault() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTP_BIND_PORT_DEFAULT;
+  }
+
+  @Override
+  protected int getHttpsBindPortDefault() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTPS_BIND_PORT_DEFAULT;
+  }
+
+  @Override
+  protected String getKeytabFile() {
+    return ReconServerConfigKeys.OZONE_RECON_KEYTAB_FILE;
+  }
+
+  @Override
+  protected String getSpnegoPrincipal() {
+    return ReconServerConfigKeys
+        .OZONE_RECON_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL;
+  }
+
+  @Override
+  protected String getEnabledKey() {
+    return ReconServerConfigKeys.OZONE_RECON_HTTP_ENABLED_KEY;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java
new file mode 100644
index 00000000000..0858d610348
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServer.java
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon;
+
+import org.apache.hadoop.hdds.cli.GenericCli;
+import org.apache.hadoop.hdds.cli.HddsVersionProvider;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+
+import picocli.CommandLine.Command;
+
+/**
+ * Recon server main class that stops and starts recon services.
+ */
+@Command(name = "ozone recon",
+    hidden = true, description = "File system health and other stats server.",
+    versionProvider = HddsVersionProvider.class,
+    mixinStandardHelpOptions = true)
+public class ReconServer extends GenericCli {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ReconServer.class);
+
+  @Inject
+  private ReconHttpServer httpServer;
+
+  public static void main(String[] args) {
+    new ReconServer().run(args);
+  }
+
+  @Override
+  public Void call() throws Exception {
+    OzoneConfiguration ozoneConfiguration = createOzoneConfiguration();
+    OzoneConfigurationProvider.setConfiguration(ozoneConfiguration);
+
+    Injector injector = Guice.createInjector(new ReconControllerModule());
+
+    httpServer = injector.getInstance(ReconHttpServer.class);
+    LOG.info("Starting Recon server");
+    httpServer.start();
+
+    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+      try {
+        stop();
+      } catch (Exception e) {
+        LOG.error("Error during stop Recon server", e);
+      }
+    }));
+    return null;
+  }
+
+  void stop() throws Exception {
+    LOG.info("Stopping Recon server");
+    httpServer.stop();
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServerConfigKeys.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServerConfigKeys.java
new file mode 100644
index 00000000000..5e4b732eb93
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/ReconServerConfigKeys.java
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
+/**
+ * This class contains constants for Recon configuration keys.
+ */
+@InterfaceAudience.Public
+@InterfaceStability.Unstable
+public final class ReconServerConfigKeys {
+
+  public static final String OZONE_RECON_HTTP_ENABLED_KEY =
+      "ozone.recon.http.enabled";
+  public static final String OZONE_RECON_HTTP_BIND_HOST_KEY =
+      "ozone.recon.http-bind-host";
+  public static final String OZONE_RECON_HTTPS_BIND_HOST_KEY =
+      "ozone.recon.https-bind-host";
+  public static final String OZONE_RECON_HTTP_ADDRESS_KEY =
+      "ozone.recon.http-address";
+  public static final String OZONE_RECON_HTTPS_ADDRESS_KEY =
+      "ozone.recon.https-address";
+  public static final String OZONE_RECON_KEYTAB_FILE =
+      "ozone.recon.keytab.file";
+  public static final String OZONE_RECON_HTTP_BIND_HOST_DEFAULT =
+      "0.0.0.0";
+  public static final int OZONE_RECON_HTTP_BIND_PORT_DEFAULT = 9888;
+  public static final int OZONE_RECON_HTTPS_BIND_PORT_DEFAULT = 9889;
+  public static final String OZONE_RECON_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL =
+      "ozone.recon.authentication.kerberos.principal";
+
+  public static final String OZONE_RECON_CONTAINER_DB_CACHE_SIZE_MB =
+      "ozone.recon.container.db.cache.size.mb";
+  public static final int OZONE_RECON_CONTAINER_DB_CACHE_SIZE_DEFAULT = 128;
+
+  public static final String OZONE_RECON_DB_DIRS = "ozone.recon.db.dirs";
+
+  /**
+   * Private constructor for utility class.
+   */
+  private ReconServerConfigKeys() {
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerKeyService.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerKeyService.java
new file mode 100644
index 00000000000..60b533e3e97
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerKeyService.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon.api;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+/**
+ * Endpoint for querying keys that belong to a container.
+ */
+@Path("/containers")
+public class ContainerKeyService {
+
+  /**
+   * Return @{@link org.apache.hadoop.ozone.recon.api.types.KeyMetadata} for
+   * all keys that belong to the container identified by the id param.
+   *
+   * @param containerId Container Id
+   * @return {@link Response}
+   */
+  @GET
+  @Path("{id}")
+  public Response getKeysForContainer(@PathParam("id") String containerId) {
+    return Response.ok().build();
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/package-info.java
new file mode 100644
index 00000000000..894e9d5d9f2
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/package-info.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The classes in this package define api endpoints for Recon.
+ */
+
+package org.apache.hadoop.ozone.recon.api;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerKeyPrefix.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerKeyPrefix.java
new file mode 100644
index 00000000000..064dc5c2f95
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerKeyPrefix.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.api.types;
+
+/**
+ * Class to encapsulate the Key information needed for the Recon container DB.
+ * Currently, it is containerId and key prefix.
+ */
+public class ContainerKeyPrefix {
+
+  private long containerId;
+  private String keyPrefix;
+
+  public ContainerKeyPrefix(long containerId, String keyPrefix) {
+    this.containerId = containerId;
+    this.keyPrefix = keyPrefix;
+  }
+
+  public long getContainerId() {
+    return containerId;
+  }
+
+  public void setContainerId(long containerId) {
+    this.containerId = containerId;
+  }
+
+  public String getKeyPrefix() {
+    return keyPrefix;
+  }
+
+  public void setKeyPrefix(String keyPrefix) {
+    this.keyPrefix = keyPrefix;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerMetadata.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerMetadata.java
new file mode 100644
index 00000000000..29af448f91f
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerMetadata.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon.api.types;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * Metadata object that represents a Container.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ContainerMetadata {
+
+  @XmlElement(name = "ContainerId")
+  private long containerId;
+
+  @XmlElement(name = "UserBytes")
+  private long usedBytes;
+
+  @XmlElement(name = "NumberOfKeys")
+  private long numberOfKeys;
+
+  @XmlElement(name = "Owner")
+  private String owner;
+
+  public long getContainerId() {
+    return containerId;
+  }
+
+  public void setContainerId(long containerId) {
+    this.containerId = containerId;
+  }
+
+  public long getUsedBytes() {
+    return usedBytes;
+  }
+
+  public void setUsedBytes(long usedBytes) {
+    this.usedBytes = usedBytes;
+  }
+
+  public long getNumberOfKeys() {
+    return numberOfKeys;
+  }
+
+  public void setNumberOfKeys(long numberOfKeys) {
+    this.numberOfKeys = numberOfKeys;
+  }
+
+  public String getOwner() {
+    return owner;
+  }
+
+  public void setOwner(String owner) {
+    this.owner = owner;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/IsoDateAdapter.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/IsoDateAdapter.java
new file mode 100644
index 00000000000..7bcdbe19f5c
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/IsoDateAdapter.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon.api.types;
+
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * A converter to convert Instant to standard date string.
+ */
+public class IsoDateAdapter extends XmlAdapter<String, Instant> {
+
+  private DateTimeFormatter iso8861Formatter;
+
+  public IsoDateAdapter() {
+    iso8861Formatter =
+        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX")
+            .withZone(ZoneOffset.UTC);
+  }
+
+  @Override
+  public Instant unmarshal(String v) throws Exception {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public String marshal(Instant v) throws Exception {
+    return iso8861Formatter.format(v);
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/KeyMetadata.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/KeyMetadata.java
new file mode 100644
index 00000000000..441ee65bae2
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/KeyMetadata.java
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.recon.api.types;
+
+import java.time.Instant;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * Metadata object represents one key in the object store.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class KeyMetadata {
+
+  @XmlElement(name = "Key")
+  private String key; // or the Object Name
+
+  @XmlJavaTypeAdapter(IsoDateAdapter.class)
+  @XmlElement(name = "LastModified")
+  private Instant lastModified;
+
+  @XmlElement(name = "ETag")
+  private String eTag;
+
+  @XmlElement(name = "Size")
+  private long size;
+
+  @XmlElement(name = "StorageClass")
+  private String storageClass;
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public Instant getLastModified() {
+    return lastModified;
+  }
+
+  public void setLastModified(Instant lastModified) {
+    this.lastModified = lastModified;
+  }
+
+  public String getETag() {
+    return eTag;
+  }
+
+  public void setETag(String tag) {
+    this.eTag = tag;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  public void setSize(long size) {
+    this.size = size;
+  }
+
+  public String getStorageClass() {
+    return storageClass;
+  }
+
+  public void setStorageClass(String storageClass) {
+    this.storageClass = storageClass;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/package-info.java
new file mode 100644
index 00000000000..cc2a7abfe57
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Common type definitions for Recon API.
+ */
+package org.apache.hadoop.ozone.recon.api.types;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/package-info.java
new file mode 100644
index 00000000000..db27ffcecc2
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains application entry point and related classes for Recon.
+ */
+package org.apache.hadoop.ozone.recon;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/package-info.java
new file mode 100644
index 00000000000..5c00ee9ef4b
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The classes in this package handle OM snapshot recovery and checkpoints.
+ */
+package org.apache.hadoop.ozone.recon.recovery;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ContainerDBServiceProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ContainerDBServiceProvider.java
new file mode 100644
index 00000000000..b2acc1daa6b
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ContainerDBServiceProvider.java
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.spi;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix;
+
+/**
+ * The Recon Container DB Service interface.
+ */
+@InterfaceStability.Unstable
+public interface ContainerDBServiceProvider {
+
+  /**
+   * Store the container to Key prefix mapping into the Recon Container DB.
+   *
+   * @param containerKeyPrefix the containerId, key-prefix tuple.
+   * @param count              Count of Keys with that prefix.
+   */
+  void storeContainerKeyMapping(ContainerKeyPrefix containerKeyPrefix,
+                                Integer count) throws IOException;
+
+  /**
+   * Get the stored key prefix count for the given containerId, key prefix.
+   *
+   * @param containerKeyPrefix the containerId, key-prefix tuple.
+   * @return count of keys with that prefix.
+   */
+  Integer getCountForForContainerKeyPrefix(
+      ContainerKeyPrefix containerKeyPrefix) throws IOException;
+
+  /**
+   * Get the stored key prefixes for the given containerId.
+   *
+   * @param containerId the given containerId.
+   * @return Map of Key prefix -> count.
+   */
+  Map<String, Integer> getKeyPrefixesForContainer(long containerId);
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/HddsDatanodeServiceProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/HddsDatanodeServiceProvider.java
new file mode 100644
index 00000000000..ce7d4143820
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/HddsDatanodeServiceProvider.java
@@ -0,0 +1,25 @@
+package org.apache.hadoop.ozone.recon.spi;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Interface to access datanode endpoints.
+ */
+public interface HddsDatanodeServiceProvider {
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/OzoneManagerServiceProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/OzoneManagerServiceProvider.java
new file mode 100644
index 00000000000..7dae610ccce
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/OzoneManagerServiceProvider.java
@@ -0,0 +1,25 @@
+package org.apache.hadoop.ozone.recon.spi;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Interface to access OM endpoints.
+ */
+public interface OzoneManagerServiceProvider {
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerDBProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerDBProvider.java
new file mode 100644
index 00000000000..2227d499006
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerDBProvider.java
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.spi;
+
+import static org.apache.hadoop.ozone.recon.ReconConstants.
+    RECON_CONTAINER_DB;
+import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.
+    OZONE_RECON_CONTAINER_DB_CACHE_SIZE_DEFAULT;
+import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.
+    OZONE_RECON_CONTAINER_DB_CACHE_SIZE_MB;
+import static org.apache.hadoop.ozone.recon.ReconServerConfigKeys.
+    OZONE_RECON_DB_DIRS;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.server.ServerUtils;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.utils.MetadataStore;
+import org.apache.hadoop.utils.MetadataStoreBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+/**
+ * Provider for the Recon container DB (Metadata store).
+ */
+public class ReconContainerDBProvider implements
+    Provider<MetadataStore> {
+
+  @VisibleForTesting
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ReconContainerDBProvider.class);
+
+  @Inject
+  private OzoneConfiguration configuration;
+
+  @Override
+  public MetadataStore get() {
+    File metaDir = ServerUtils.getDirWithFallBackToOzoneMetadata(configuration,
+        OZONE_RECON_DB_DIRS, "Recon");
+    File containerDBPath = new File(metaDir, RECON_CONTAINER_DB);
+    int cacheSize = configuration.getInt(OZONE_RECON_CONTAINER_DB_CACHE_SIZE_MB,
+        OZONE_RECON_CONTAINER_DB_CACHE_SIZE_DEFAULT);
+
+    try {
+      return MetadataStoreBuilder.newBuilder()
+          .setConf(configuration)
+          .setDbFile(containerDBPath)
+          .setCacheSize(cacheSize * OzoneConsts.MB)
+          .build();
+    } catch (IOException ioEx) {
+      LOG.error("Unable to initialize Recon container metadata store.", ioEx);
+    }
+    return null;
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/StorageContainerServiceProvider.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/StorageContainerServiceProvider.java
new file mode 100644
index 00000000000..db052a7be57
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/StorageContainerServiceProvider.java
@@ -0,0 +1,25 @@
+package org.apache.hadoop.ozone.recon.spi;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Interface to access SCM endpoints.
+ */
+public interface StorageContainerServiceProvider {
+}
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ContainerDBServiceProviderImpl.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ContainerDBServiceProviderImpl.java
new file mode 100644
index 00000000000..8706f8d4854
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ContainerDBServiceProviderImpl.java
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.spi.impl;
+
+import static org.apache.commons.compress.utils.CharsetNames.UTF_8;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix;
+import org.apache.hadoop.ozone.recon.spi.ContainerDBServiceProvider;
+import org.apache.hadoop.utils.MetaStoreIterator;
+import org.apache.hadoop.utils.MetadataStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.primitives.Longs;
+
+/**
+ * Implementation of the Recon Container DB Service.
+ */
+@Singleton
+public class ContainerDBServiceProviderImpl
+    implements ContainerDBServiceProvider {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ContainerDBServiceProviderImpl.class);
+  private final static String KEY_DELIMITER = "_";
+
+  @Inject
+  private MetadataStore containerDBStore;
+
+  /**
+   * Concatenate the containerId and Key Prefix using a delimiter and store the
+   * count into the container DB store.
+   *
+   * @param containerKeyPrefix the containerId, key-prefix tuple.
+   * @param count Count of the keys matching that prefix.
+   * @throws IOException
+   */
+  @Override
+  public void storeContainerKeyMapping(ContainerKeyPrefix containerKeyPrefix,
+                                       Integer count)
+      throws IOException {
+    byte[] containerIdBytes = Longs.toByteArray(containerKeyPrefix
+        .getContainerId());
+    byte[] keyPrefixBytes = (KEY_DELIMITER + containerKeyPrefix.getKeyPrefix())
+        .getBytes(UTF_8);
+    byte[] dbKey = ArrayUtils.addAll(containerIdBytes, keyPrefixBytes);
+    byte[] dbValue = ByteBuffer.allocate(Integer.BYTES).putInt(count).array();
+    containerDBStore.put(dbKey, dbValue);
+  }
+
+  /**
+   * Put together the key from the passed in object and get the count from
+   * the container DB store.
+   *
+   * @param containerKeyPrefix the containerId, key-prefix tuple.
+   * @return count of keys matching the containerId, key-prefix.
+   * @throws IOException
+   */
+  @Override
+  public Integer getCountForForContainerKeyPrefix(
+      ContainerKeyPrefix containerKeyPrefix) throws IOException {
+    byte[] containerIdBytes = Longs.toByteArray(containerKeyPrefix
+        .getContainerId());
+    byte[] keyPrefixBytes = (KEY_DELIMITER + containerKeyPrefix
+        .getKeyPrefix()).getBytes(UTF_8);
+    byte[] dbKey = ArrayUtils.addAll(containerIdBytes, keyPrefixBytes);
+    byte[] dbValue = containerDBStore.get(dbKey);
+    return ByteBuffer.wrap(dbValue).getInt();
+  }
+
+  /**
+   * Use the DB's prefix seek iterator to start the scan from the given
+   * container ID prefix.
+   *
+   * @param containerId the given containerId.
+   * @return Map of (Key-Prefix,Count of Keys).
+   */
+  @Override
+  public Map<String, Integer> getKeyPrefixesForContainer(long containerId) {
+
+    Map<String, Integer> prefixes = new HashMap<>();
+    MetaStoreIterator<MetadataStore.KeyValue> containerIterator =
+        containerDBStore.iterator();
+    byte[] containerIdPrefixBytes = Longs.toByteArray(containerId);
+    containerIterator.prefixSeek(containerIdPrefixBytes);
+    while (containerIterator.hasNext()) {
+      MetadataStore.KeyValue keyValue = containerIterator.next();
+      byte[] containerKey = keyValue.getKey();
+      long containerIdFromDB = ByteBuffer.wrap(ArrayUtils.subarray(
+          containerKey, 0, Long.BYTES)).getLong();
+
+      //The prefix seek only guarantees that the iterator's head will be
+      // positioned at the first prefix match. We still have to check the key
+      // prefix.
+      if (containerIdFromDB == containerId) {
+        byte[] keyPrefix = ArrayUtils.subarray(containerKey,
+            containerIdPrefixBytes.length + 1,
+            containerKey.length);
+        try {
+          prefixes.put(new String(keyPrefix, UTF_8),
+              ByteBuffer.wrap(keyValue.getValue()).getInt());
+        } catch (UnsupportedEncodingException e) {
+          LOG.warn("Unable to read key prefix from container DB.", e);
+        }
+      } else {
+        break; //Break when the first mismatch occurs.
+      }
+    }
+    return prefixes;
+  }
+
+}
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java
new file mode 100644
index 00000000000..1ed44294d1e
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * The classes in this package define the Service Provider implementations for
+ * Recon. This provides connectivity to underlying Ozone subsystems.
+ */
+package org.apache.hadoop.ozone.recon.spi.impl;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/package-info.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/package-info.java
new file mode 100644
index 00000000000..24692facf0a
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/spi/package-info.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The classes in this package define the Service Provider interfaces for
+ * Recon. The implementations of Spi interfaces provide connectivity to
+ * underlying Ozone subsystems.
+ */
+package org.apache.hadoop.ozone.recon.spi;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/main/resources/webapps.recon.WEB-INF/web.xml b/hadoop-ozone/ozone-recon/src/main/resources/webapps.recon.WEB-INF/web.xml
new file mode 100644
index 00000000000..c32f64ced89
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/main/resources/webapps.recon.WEB-INF/web.xml
@@ -0,0 +1,33 @@
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+  <servlet>
+    <servlet-name>jaxrs</servlet-name>
+    <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+    <init-param>
+      <param-name>javax.ws.rs.Application</param-name>
+      <param-value>org.apache.hadoop.ozone.recon.ReconApplication</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>jaxrs</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+
+</web-app>
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/package-info.java b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/package-info.java
new file mode 100644
index 00000000000..d0066a38554
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/package-info.java
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Package for recon server tests.
+ */
+package org.apache.hadoop.ozone.recon;
\ No newline at end of file
diff --git a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestContainerDBServiceProviderImpl.java b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestContainerDBServiceProviderImpl.java
new file mode 100644
index 00000000000..2fc064289a7
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestContainerDBServiceProviderImpl.java
@@ -0,0 +1,148 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.spi.impl;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix;
+import org.apache.hadoop.ozone.recon.spi.ContainerDBServiceProvider;
+import org.apache.hadoop.utils.MetaStoreIterator;
+import org.apache.hadoop.utils.MetadataStore;
+import org.apache.hadoop.utils.MetadataStoreBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Unit Tests for ContainerDBServiceProviderImpl.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TestContainerDBServiceProviderImpl {
+
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+
+  private MetadataStore containerDBStore;
+  private ContainerDBServiceProvider containerDbServiceProvider
+      = new ContainerDBServiceProviderImpl();
+  private Injector injector;
+
+  @Before
+  public void setUp() throws IOException {
+    tempFolder.create();
+    File dbDir = tempFolder.getRoot();
+    containerDBStore = MetadataStoreBuilder.newBuilder()
+        .setConf(new OzoneConfiguration())
+        .setCreateIfMissing(true)
+        .setDbFile(dbDir)
+        .build();
+    injector = Guice.createInjector(new AbstractModule() {
+      @Override
+      protected void configure() {
+        bind(MetadataStore.class).toInstance(containerDBStore);
+        bind(ContainerDBServiceProvider.class)
+            .toInstance(containerDbServiceProvider);
+      }
+    });
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    tempFolder.delete();
+  }
+
+  @Test
+  public void testStoreContainerKeyMapping() throws Exception {
+
+    long containerId = System.currentTimeMillis();
+    Map<String, Integer> prefixCounts = new HashMap<>();
+    prefixCounts.put("V1/B1/K1", 1);
+    prefixCounts.put("V1/B1/K2", 2);
+    prefixCounts.put("V1/B2/K3", 3);
+
+    for (String prefix : prefixCounts.keySet()) {
+      ContainerKeyPrefix containerKeyPrefix = new ContainerKeyPrefix(
+          containerId, prefix);
+      containerDbServiceProvider.storeContainerKeyMapping(
+          containerKeyPrefix, prefixCounts.get(prefix));
+    }
+
+    int count = 0;
+    MetaStoreIterator<MetadataStore.KeyValue> iterator =
+        containerDBStore.iterator();
+    while (iterator.hasNext()) {
+      iterator.next();
+      count++;
+    }
+    assertTrue(count == 3);
+  }
+
+  @Test
+  public void testGetCountForForContainerKeyPrefix() throws Exception {
+    long containerId = System.currentTimeMillis();
+
+    containerDbServiceProvider.storeContainerKeyMapping(new
+        ContainerKeyPrefix(containerId, "V1/B1/K1"), 2);
+
+    Integer count = containerDbServiceProvider.
+        getCountForForContainerKeyPrefix(new ContainerKeyPrefix(containerId,
+            "V1/B1/K1"));
+    assertTrue(count == 2);
+  }
+
+  @Test
+  public void testGetKeyPrefixesForContainer() throws Exception {
+    long containerId = System.currentTimeMillis();
+
+    containerDbServiceProvider.storeContainerKeyMapping(new
+        ContainerKeyPrefix(containerId, "V1/B1/K1"), 1);
+
+    containerDbServiceProvider.storeContainerKeyMapping(new
+        ContainerKeyPrefix(containerId, "V1/B1/K2"), 2);
+
+    long nextContainerId = System.currentTimeMillis();
+    containerDbServiceProvider.storeContainerKeyMapping(new
+        ContainerKeyPrefix(nextContainerId, "V1/B2/K1"), 3);
+
+    Map<String, Integer> keyPrefixMap = containerDbServiceProvider
+        .getKeyPrefixesForContainer(containerId);
+    assertTrue(keyPrefixMap.size() == 2);
+    assertTrue(keyPrefixMap.get("V1/B1/K1") == 1);
+    assertTrue(keyPrefixMap.get("V1/B1/K2") == 2);
+
+    keyPrefixMap = containerDbServiceProvider
+        .getKeyPrefixesForContainer(nextContainerId);
+    assertTrue(keyPrefixMap.size() == 1);
+    assertTrue(keyPrefixMap.get("V1/B2/K1") == 3);
+  }
+}
diff --git a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java
new file mode 100644
index 00000000000..932c4375c8c
--- /dev/null
+++ b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/package-info.java
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Package for recon server impl tests.
+ */
+package org.apache.hadoop.ozone.recon.spi.impl;
\ No newline at end of file
diff --git a/hadoop-ozone/ozonefs-lib/pom.xml b/hadoop-ozone/ozonefs-lib-current/pom.xml
similarity index 98%
rename from hadoop-ozone/ozonefs-lib/pom.xml
rename to hadoop-ozone/ozonefs-lib-current/pom.xml
index b1cbaf872d3..2fe09cb30d0 100644
--- a/hadoop-ozone/ozonefs-lib/pom.xml
+++ b/hadoop-ozone/ozonefs-lib-current/pom.xml
@@ -21,7 +21,7 @@
     <artifactId>hadoop-ozone</artifactId>
     <version>0.4.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+  <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
   <name>Apache Hadoop Ozone FileSystem Single Jar Library</name>
   <packaging>jar</packaging>
   <description>This projects creates an uber jar from ozonefs with all the
diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapter.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapter.java
index 59f3f7a97c1..d7fc7d89854 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapter.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapter.java
@@ -17,6 +17,9 @@
  */
 package org.apache.hadoop.fs.ozone;
 
+import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
+import org.apache.hadoop.security.token.Token;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
@@ -52,4 +55,6 @@ public interface OzoneClientAdapter {
 
   Iterator<BasicKeyInfo> listKeys(String pathKey);
 
+  Token<OzoneTokenIdentifier> getDelegationToken(String renewer)
+      throws IOException;
 }
diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapterImpl.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapterImpl.java
index 8c698492d0d..3b034ed5ff7 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapterImpl.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneClientAdapterImpl.java
@@ -22,9 +22,12 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdds.client.ReplicationFactor;
 import org.apache.hadoop.hdds.client.ReplicationType;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.io.Text;
 import org.apache.hadoop.ozone.OzoneConfigKeys;
 import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneBucket;
@@ -35,6 +38,10 @@ import org.apache.hadoop.ozone.client.OzoneVolume;
 import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
 
 import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
+
+import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
+import org.apache.hadoop.security.token.Token;
+import org.apache.hadoop.security.token.TokenRenewer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,8 +258,64 @@ public class OzoneClientAdapterImpl implements OzoneClientAdapter {
     return new IteratorAdapter(bucket.listKeys(pathKey));
   }
 
+  @Override
+  public Token<OzoneTokenIdentifier> getDelegationToken(String renewer)
+      throws IOException {
+    Token<OzoneTokenIdentifier> token =
+        ozoneClient.getObjectStore().getDelegationToken(new Text(renewer));
+    token.setKind(OzoneTokenIdentifier.KIND_NAME);
+    return token;
+  }
+
   /**
-   * Adapter to conver OzoneKey to a safe and simple Key implementation.
+   * Ozone Delegation Token Renewer.
+   */
+  @InterfaceAudience.Private
+  public static class Renewer extends TokenRenewer {
+
+    //Ensure that OzoneConfiguration files are loaded before trying to use
+    // the renewer.
+    static {
+      OzoneConfiguration.activate();
+    }
+
+    public Text getKind() {
+      return OzoneTokenIdentifier.KIND_NAME;
+    }
+
+    @Override
+    public boolean handleKind(Text kind) {
+      return getKind().equals(kind);
+    }
+
+    @Override
+    public boolean isManaged(Token<?> token) throws IOException {
+      return true;
+    }
+
+    @Override
+    public long renew(Token<?> token, Configuration conf)
+        throws IOException, InterruptedException {
+      Token<OzoneTokenIdentifier> ozoneDt =
+          (Token<OzoneTokenIdentifier>) token;
+      OzoneClient ozoneClient =
+          OzoneClientFactory.getRpcClient(conf);
+      return ozoneClient.getObjectStore().renewDelegationToken(ozoneDt);
+    }
+
+    @Override
+    public void cancel(Token<?> token, Configuration conf)
+        throws IOException, InterruptedException {
+      Token<OzoneTokenIdentifier> ozoneDt =
+          (Token<OzoneTokenIdentifier>) token;
+      OzoneClient ozoneClient =
+          OzoneClientFactory.getRpcClient(conf);
+      ozoneClient.getObjectStore().cancelDelegationToken(ozoneDt);
+    }
+  }
+
+  /**
+   * Adapter to convert OzoneKey to a safe and simple Key implementation.
    */
   public static class IteratorAdapter implements Iterator<BasicKeyInfo> {
 
diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java
index ad6de8afc0c..13b7ddaccd5 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/OzoneFileSystem.java
@@ -48,7 +48,9 @@ import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
 import org.apache.hadoop.fs.GlobalStorageStatistics;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.security.x509.SecurityConfig;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.util.Progressable;
 
 import com.google.common.base.Preconditions;
@@ -84,6 +86,7 @@ public class OzoneFileSystem extends FileSystem {
   private Path workingDir;
 
   private OzoneClientAdapter adapter;
+  private boolean securityEnabled;
 
 
   private OzoneFSStorageStatistics storageStatistics;
@@ -156,6 +159,10 @@ public class OzoneFileSystem extends FileSystem {
         } else {
           ozoneConfiguration = new OzoneConfiguration(conf);
         }
+        SecurityConfig secConfig = new SecurityConfig(ozoneConfiguration);
+        if (secConfig.isSecurityEnabled()) {
+          this.securityEnabled = true;
+        }
         this.adapter = new OzoneClientAdapterImpl(ozoneConfiguration,
             volumeStr, bucketStr, storageStatistics);
       }
@@ -669,6 +676,12 @@ public class OzoneFileSystem extends FileSystem {
     return workingDir;
   }
 
+  @Override
+  public Token<?> getDelegationToken(String renewer) throws IOException {
+    return securityEnabled? adapter.getDelegationToken(renewer) :
+        super.getDelegationToken(renewer);
+  }
+
   /**
    * Get the username of the FS.
    *
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index ac20f1e8d5c..9884215fd72 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -40,7 +40,7 @@
     <module>client</module>
     <module>ozone-manager</module>
     <module>ozonefs</module>
-    <module>ozonefs-lib</module>
+    <module>ozonefs-lib-current</module>
     <module>ozonefs-lib-legacy</module>
     <module>tools</module>
     <module>integration-test</module>
@@ -48,6 +48,7 @@
     <module>datanode</module>
     <module>s3gateway</module>
     <module>dist</module>
+    <module>ozone-recon</module>
   </modules>
 
   <repositories>
@@ -102,7 +103,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-ozone-filesystem-lib</artifactId>
+        <artifactId>hadoop-ozone-filesystem-lib-current</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
@@ -158,6 +159,11 @@
         <artifactId>hadoop-hdds-tools</artifactId>
         <version>${hdds.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-ozone-recon</artifactId>
+        <version>${ozone.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdds-container-service</artifactId>
@@ -198,68 +204,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-framework</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-tools</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-server-scm</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdds-container-service</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index bffe6dd8079..a0c8fe09131 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -179,6 +179,11 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-ozone-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/PlainTextMultipartUploadReader.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/PlainTextMultipartUploadReader.java
new file mode 100644
index 00000000000..599b4731947
--- /dev/null
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/PlainTextMultipartUploadReader.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.s3.endpoint;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+/**
+ * Body reader to accept plain text MPU.
+ * <p>
+ * Aws s3 api sends a multipartupload request with the content type
+ * 'text/plain' in case of using 'aws s3 cp' (instead of aws s3api).
+ * <p>
+ * Our generic ObjectEndpoint.multipartUpload has a
+ * CompleteMultipartUploadRequest parameter, which is required only for the
+ * completion request.
+ * <p>
+ * But JaxRS tries to parse it from the body for the requests and in case of
+ * text/plain requests this parsing is failed. This simple BodyReader enables
+ * to parse an empty text/plain message and return with an empty completion
+ * request.
+ */
+@Provider
+@Consumes("text/plain")
+public class PlainTextMultipartUploadReader
+    implements MessageBodyReader<CompleteMultipartUploadRequest> {
+
+  @Override
+  public boolean isReadable(Class<?> type, Type genericType,
+      Annotation[] annotations, MediaType mediaType) {
+    return type.equals(CompleteMultipartUploadRequest.class)
+        && mediaType.equals(MediaType.TEXT_PLAIN_TYPE);
+  }
+
+  @Override
+  public CompleteMultipartUploadRequest readFrom(
+      Class<CompleteMultipartUploadRequest> type, Type genericType,
+      Annotation[] annotations, MediaType mediaType,
+      MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+      throws IOException, WebApplicationException {
+    return new CompleteMultipartUploadRequest();
+  }
+}
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 3cef596c4e3..fbc8a7d3133 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -80,7 +80,17 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>3.0.1</version>
       <scope>provided</scope>
     </dependency>
-
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-ozone-integration-test</artifactId>
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOMClient.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOMClient.java
new file mode 100644
index 00000000000..cfc1e1ebdaa
--- /dev/null
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOMClient.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.hadoop.ozone.genesis;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.ipc.Client;
+import org.apache.hadoop.ipc.ProtobufRpcEngine;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.ozone.OmUtils;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.helpers.*;
+import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
+import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.ratis.protocol.ClientId;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
+
+/**
+ * Benchmarks OM Client.
+ */
+@State(Scope.Thread)
+public class BenchMarkOMClient {
+
+  private static String testDir;
+  private static ReentrantLock lock = new ReentrantLock();
+  private static String volumeName = UUID.randomUUID().toString();
+  private static String bucketName = UUID.randomUUID().toString();
+  private static List<String> keyNames = new ArrayList<>();
+  private static List<Long> clientIDs = new ArrayList<>();
+  private static OzoneManagerProtocolClientSideTranslatorPB ozoneManagerClient;
+  private static volatile boolean bool = false;
+
+  @Setup(Level.Trial)
+  public static void initialize() throws IOException {
+    try {
+      lock.lock();
+      if (!bool) {
+        bool = true;
+        OzoneConfiguration conf = new OzoneConfiguration();
+        conf.setBoolean(OZONE_ENABLED, true);
+        testDir = GenesisUtil.getTempPath()
+            .resolve(RandomStringUtils.randomNumeric(7)).toString();
+        conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir);
+
+        // set the ip address and port number for the OM service
+        conf.set(OMConfigKeys.OZONE_OM_ADDRESS_KEY, "OMADDR:PORT");
+        UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+        long omVersion = RPC.getProtocolVersion(OzoneManagerProtocolPB.class);
+        InetSocketAddress omAddress = OmUtils.getOmAddressForClients(conf);
+        RPC.setProtocolEngine(conf, OzoneManagerProtocolPB.class,
+            ProtobufRpcEngine.class);
+        ozoneManagerClient = new OzoneManagerProtocolClientSideTranslatorPB(
+            RPC.getProxy(OzoneManagerProtocolPB.class, omVersion, omAddress,
+                ugi, conf, NetUtils.getDefaultSocketFactory(conf),
+                Client.getRpcTimeout(conf)), ClientId.randomId().toString());
+
+        // prepare OM
+        ozoneManagerClient.createVolume(
+            new OmVolumeArgs.Builder().setVolume(volumeName)
+                .setAdminName(UserGroupInformation.getLoginUser().getUserName())
+                .setOwnerName(UserGroupInformation.getLoginUser().getUserName())
+                .build());
+        ozoneManagerClient.createBucket(
+            new OmBucketInfo.Builder().setBucketName(bucketName)
+                .setVolumeName(volumeName).build());
+        createKeys(10);
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  private static void createKeys(int numKeys) throws IOException {
+    for (int i = 0; i < numKeys; i++) {
+      String key = UUID.randomUUID().toString();
+      OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+          .setVolumeName(volumeName)
+          .setBucketName(bucketName)
+          .setKeyName(key)
+          .setDataSize(0)
+          .setFactor(HddsProtos.ReplicationFactor.ONE)
+          .setType(HddsProtos.ReplicationType.RATIS)
+          .build();
+      OpenKeySession keySession = ozoneManagerClient.openKey(omKeyArgs);
+      long clientID = keySession.getId();
+      keyNames.add(key);
+      clientIDs.add(clientID);
+    }
+  }
+
+  @TearDown(Level.Trial)
+  public static void tearDown() throws IOException {
+    try {
+      lock.lock();
+      if (ozoneManagerClient != null) {
+        ozoneManagerClient.close();
+        ozoneManagerClient = null;
+        FileUtil.fullyDelete(new File(testDir));
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Threads(6)
+  @Benchmark
+  public void allocateBlockBenchMark(BenchMarkOMClient state,
+      Blackhole bh) throws IOException {
+    int index = (int) (Math.random() * keyNames.size());
+    String key = keyNames.get(index);
+    OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+        .setVolumeName(volumeName)
+        .setBucketName(bucketName)
+        .setKeyName(key)
+        .setDataSize(50)
+        .setFactor(HddsProtos.ReplicationFactor.ONE)
+        .setType(HddsProtos.ReplicationType.RATIS)
+        .build();
+    state.ozoneManagerClient
+        .allocateBlock(omKeyArgs, clientIDs.get(index), new ExcludeList());
+  }
+}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java
new file mode 100644
index 00000000000..6188845cefe
--- /dev/null
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkOzoneManager.java
@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.hadoop.ozone.genesis;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
+import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.server.SCMConfigurator;
+import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.*;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.authentication.client.AuthenticationException;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
+
+/**
+ * Benchmarks OzoneManager.
+ */
+@State(Scope.Thread)
+public class BenchMarkOzoneManager {
+
+  private static String testDir;
+  private static OzoneManager om;
+  private static StorageContainerManager scm;
+  private static ReentrantLock lock = new ReentrantLock();
+  private static String volumeName = UUID.randomUUID().toString();
+  private static String bucketName = UUID.randomUUID().toString();
+  private static List<String> keyNames = new ArrayList<>();
+  private static List<Long> clientIDs = new ArrayList<>();
+
+  private static int numPipelines = 1;
+  private static int numContainersPerPipeline = 3;
+
+  @Setup(Level.Trial)
+  public static void initialize()
+      throws IOException, AuthenticationException, InterruptedException {
+    try {
+      lock.lock();
+      if (scm == null) {
+        OzoneConfiguration conf = new OzoneConfiguration();
+        conf.setBoolean(OZONE_ENABLED, true);
+        testDir = GenesisUtil.getTempPath()
+            .resolve(RandomStringUtils.randomNumeric(7)).toString();
+        conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir);
+
+        GenesisUtil.configureSCM(conf, 10);
+        GenesisUtil.configureOM(conf, 20);
+        conf.setInt(OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT,
+            numContainersPerPipeline);
+        GenesisUtil.addPipelines(ReplicationFactor.THREE, numPipelines, conf);
+
+        scm = GenesisUtil.getScm(conf, new SCMConfigurator());
+        scm.start();
+        om = GenesisUtil.getOm(conf);
+        om.start();
+
+        // prepare SCM
+        PipelineManager pipelineManager = scm.getPipelineManager();
+        for (Pipeline pipeline : pipelineManager
+            .getPipelines(ReplicationType.RATIS, ReplicationFactor.THREE)) {
+          pipelineManager.openPipeline(pipeline.getId());
+        }
+        scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS,
+            new SCMChillModeManager.ChillModeStatus(false));
+        Thread.sleep(1000);
+
+        // prepare OM
+        om.createVolume(new OmVolumeArgs.Builder().setVolume(volumeName)
+            .setAdminName(UserGroupInformation.getLoginUser().getUserName())
+            .setOwnerName(UserGroupInformation.getLoginUser().getUserName())
+            .build());
+        om.createBucket(new OmBucketInfo.Builder().setBucketName(bucketName)
+            .setVolumeName(volumeName).build());
+        createKeys(100000);
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  private static void createKeys(int numKeys) throws IOException {
+    for (int i = 0; i < numKeys; i++) {
+      String key = UUID.randomUUID().toString();
+      OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+          .setVolumeName(volumeName)
+          .setBucketName(bucketName)
+          .setKeyName(key)
+          .setDataSize(0)
+          .setFactor(HddsProtos.ReplicationFactor.THREE)
+          .setType(HddsProtos.ReplicationType.RATIS)
+          .build();
+      OpenKeySession keySession = om.getKeyManager().openKey(omKeyArgs);
+      long clientID = keySession.getId();
+      keyNames.add(key);
+      clientIDs.add(clientID);
+    }
+  }
+
+  @TearDown(Level.Trial)
+  public static void tearDown() {
+    try {
+      lock.lock();
+      if (scm != null) {
+        scm.stop();
+        scm.join();
+        scm = null;
+        om.stop();
+        om.join();
+        om = null;
+        FileUtil.fullyDelete(new File(testDir));
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Threads(4)
+  @Benchmark
+  public void allocateBlockBenchMark(BenchMarkOzoneManager state,
+      Blackhole bh) throws IOException {
+    int index = (int) (Math.random() * keyNames.size());
+    String key = keyNames.get(index);
+    OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+        .setVolumeName(volumeName)
+        .setBucketName(bucketName)
+        .setKeyName(key)
+        .setDataSize(50)
+        .setFactor(HddsProtos.ReplicationFactor.THREE)
+        .setType(HddsProtos.ReplicationType.RATIS)
+        .build();
+    state.om.allocateBlock(omKeyArgs, clientIDs.get(index), new ExcludeList());
+  }
+
+  @Threads(4)
+  @Benchmark
+  public void createAndCommitKeyBenchMark(BenchMarkOzoneManager state,
+      Blackhole bh) throws IOException {
+    String key = UUID.randomUUID().toString();
+    OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+        .setVolumeName(volumeName)
+        .setBucketName(bucketName)
+        .setKeyName(key)
+        .setDataSize(50)
+        .setFactor(HddsProtos.ReplicationFactor.THREE)
+        .setType(HddsProtos.ReplicationType.RATIS)
+        .build();
+    OpenKeySession openKeySession = state.om.openKey(omKeyArgs);
+    state.om.allocateBlock(omKeyArgs, openKeySession.getId(),
+        new ExcludeList());
+  }
+}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkBlockManager.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java
similarity index 51%
rename from hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkBlockManager.java
rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java
index cc087090464..1d170308c66 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkBlockManager.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkSCM.java
@@ -18,76 +18,46 @@
 
 package org.apache.hadoop.ozone.genesis;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.locks.ReentrantLock;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
-import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.scm.block.BlockManager;
+import org.apache.hadoop.hdds.scm.chillmode.SCMChillModeManager;
+import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.hdds.scm.events.SCMEvents;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
 import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
 import org.apache.hadoop.hdds.scm.server.SCMConfigurator;
-import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
 import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
-import org.apache.hadoop.hdds.server.ServerUtils;
-import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.common.Storage;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.apache.hadoop.utils.MetadataStore;
-import org.apache.hadoop.utils.MetadataStoreBuilder;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.UUID;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DB_CACHE_SIZE_DEFAULT;
-import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DB_CACHE_SIZE_MB;
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
-import static org.apache.hadoop.ozone.OzoneConsts.SCM_PIPELINE_DB;
 
 /**
  * Benchmarks BlockManager class.
  */
 @State(Scope.Thread)
-public class BenchMarkBlockManager {
+public class BenchMarkSCM {
 
   private static String testDir;
   private static StorageContainerManager scm;
-  private static PipelineManager pipelineManager;
   private static BlockManager blockManager;
   private static ReentrantLock lock = new ReentrantLock();
 
-  @Param({"1", "10", "100", "1000", "10000", "100000"})
+  @Param({ "1", "10", "100", "1000", "10000", "100000" })
   private static int numPipelines;
-  @Param({"3", "10", "100"})
+  @Param({ "3", "10", "100" })
   private static int numContainersPerPipeline;
 
-  private static StorageContainerManager getScm(OzoneConfiguration conf,
-      SCMConfigurator configurator) throws IOException,
-      AuthenticationException {
-    conf.setBoolean(OZONE_ENABLED, true);
-    SCMStorageConfig scmStore = new SCMStorageConfig(conf);
-    if(scmStore.getState() != Storage.StorageState.INITIALIZED) {
-      String clusterId = UUID.randomUUID().toString();
-      String scmId = UUID.randomUUID().toString();
-      scmStore.setClusterId(clusterId);
-      scmStore.setScmId(scmId);
-      // writes the version file properties
-      scmStore.initialize();
-    }
-    return new StorageContainerManager(conf, configurator);
-  }
-
   @Setup(Level.Trial)
   public static void initialize()
       throws IOException, AuthenticationException, InterruptedException {
@@ -95,30 +65,28 @@ public class BenchMarkBlockManager {
       lock.lock();
       if (scm == null) {
         OzoneConfiguration conf = new OzoneConfiguration();
+        conf.setBoolean(OZONE_ENABLED, true);
         testDir = GenesisUtil.getTempPath()
             .resolve(RandomStringUtils.randomNumeric(7)).toString();
         conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir);
+
+        GenesisUtil.configureSCM(conf, 10);
         conf.setInt(OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT,
             numContainersPerPipeline);
-        final File metaDir = ServerUtils.getScmDbDir(conf);
-        final File pipelineDBPath = new File(metaDir, SCM_PIPELINE_DB);
-        int cacheSize = conf.getInt(OZONE_SCM_DB_CACHE_SIZE_MB,
-            OZONE_SCM_DB_CACHE_SIZE_DEFAULT);
-        MetadataStore pipelineStore =
-            MetadataStoreBuilder.newBuilder().setCreateIfMissing(true)
-                .setConf(conf).setDbFile(pipelineDBPath)
-                .setCacheSize(cacheSize * OzoneConsts.MB).build();
-        addPipelines(ReplicationFactor.THREE,
-            pipelineStore);
-        pipelineStore.close();
-        scm = getScm(conf, new SCMConfigurator());
-        pipelineManager = scm.getPipelineManager();
+        GenesisUtil.addPipelines(ReplicationFactor.THREE, numPipelines, conf);
+
+        scm = GenesisUtil.getScm(conf, new SCMConfigurator());
+        scm.start();
+        blockManager = scm.getScmBlockManager();
+
+        // prepare SCM
+        PipelineManager pipelineManager = scm.getPipelineManager();
         for (Pipeline pipeline : pipelineManager
             .getPipelines(ReplicationType.RATIS, ReplicationFactor.THREE)) {
           pipelineManager.openPipeline(pipeline.getId());
         }
-        blockManager = scm.getScmBlockManager();
-        scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
+        scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS,
+            new SCMChillModeManager.ChillModeStatus(false));
         Thread.sleep(1000);
       }
     } finally {
@@ -126,42 +94,27 @@ public class BenchMarkBlockManager {
     }
   }
 
-  @Setup(Level.Trial)
+  @TearDown(Level.Trial)
   public static void tearDown() {
-    if (scm != null) {
-      scm.stop();
-      scm.join();
-      FileUtil.fullyDelete(new File(testDir));
-    }
-  }
-
-  private static void addPipelines(ReplicationFactor factor,
-      MetadataStore pipelineStore) throws IOException {
-    List<DatanodeDetails> nodes = new ArrayList<>();
-    for (int i = 0; i < factor.getNumber(); i++) {
-      nodes
-          .add(GenesisUtil.createDatanodeDetails(UUID.randomUUID().toString()));
-    }
-    for (int i = 0; i < numPipelines; i++) {
-      Pipeline pipeline =
-          Pipeline.newBuilder()
-              .setState(Pipeline.PipelineState.OPEN)
-              .setId(PipelineID.randomId())
-              .setType(ReplicationType.RATIS)
-              .setFactor(factor)
-              .setNodes(nodes)
-              .build();
-      pipelineStore.put(pipeline.getId().getProtobuf().toByteArray(),
-          pipeline.getProtobufMessage().toByteArray());
+    try {
+      lock.lock();
+      if (scm != null) {
+        scm.stop();
+        scm.join();
+        scm = null;
+        FileUtil.fullyDelete(new File(testDir));
+      }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Threads(4)
   @Benchmark
-  public void allocateBlockBenchMark(BenchMarkBlockManager state,
+  public void allocateBlockBenchMark(BenchMarkSCM state,
       Blackhole bh) throws IOException {
     state.blockManager
         .allocateBlock(50, ReplicationType.RATIS, ReplicationFactor.THREE,
-            "Genesis");
+            "Genesis", new ExcludeList());
   }
 }
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/Genesis.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/Genesis.java
index 74de2d969e1..2de9b0faef6 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/Genesis.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/Genesis.java
@@ -39,20 +39,16 @@ import picocli.CommandLine.Command;
     mixinStandardHelpOptions = true)
 public final class Genesis {
 
-  // For adding benchmark to Genesis add the benchmark name in the default value
-  // and description for this option.
-  @Option(names = "-benchmark", required = true, split = ",",
-      defaultValue = "BenchMarkContainerStateMap,BenchMarkOMKeyAllocation,"
-          + "BenchMarkBlockManager,BenchMarkMetadataStoreReads,"
-          + "BenchMarkMetadataStoreWrites,BenchMarkDatanodeDispatcher"
-          + "BenchMarkRocksDbStore",
-      description =
+  // After adding benchmark in genesis package add the benchmark name in the
+  // description for this option.
+  @Option(names = "-benchmark", split = ",", description =
       "Option used for specifying benchmarks to run.\n"
           + "Ex. ozone genesis -benchmark BenchMarkContainerStateMap,"
           + "BenchMarkOMKeyAllocation.\n"
           + "Possible benchmarks which can be used are "
           + "{BenchMarkContainerStateMap, BenchMarkOMKeyAllocation, "
-          + "BenchMarkBlockManager, BenchMarkMetadataStoreReads, "
+          + "BenchMarkOzoneManager, BenchMarkOMClient, "
+          + "BenchMarkSCM, BenchMarkMetadataStoreReads, "
           + "BenchMarkMetadataStoreWrites, BenchMarkDatanodeDispatcher, "
           + "BenchMarkRocksDbStore}")
   private static String[] benchmarks;
@@ -74,8 +70,15 @@ public final class Genesis {
     }
 
     OptionsBuilder optionsBuilder = new OptionsBuilder();
-    for (String benchmark : benchmarks) {
-      optionsBuilder.include(benchmark);
+    if (benchmarks != null) {
+      // The OptionsBuilder#include takes a regular expression as argument.
+      // Therefore it is important to keep the benchmark names unique for
+      // running a benchmark. For example if there are two benchmarks -
+      // BenchMarkOM and BenchMarkOMClient and we include BenchMarkOM then
+      // both the benchmarks will be run.
+      for (String benchmark : benchmarks) {
+        optionsBuilder.include(benchmark);
+      }
     }
     optionsBuilder.warmupIterations(2)
         .measurementIterations(20)
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java
index 7936d0c8a7b..6bff82b5755 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java
@@ -20,14 +20,37 @@ package org.apache.hadoop.ozone.genesis;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.StorageUnit;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
+import org.apache.hadoop.hdds.scm.server.SCMConfigurator;
+import org.apache.hadoop.hdds.scm.server.SCMStorageConfig;
+import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
+import org.apache.hadoop.hdds.server.ServerUtils;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.common.Storage;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.OMStorage;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.utils.MetadataStore;
 import org.apache.hadoop.utils.MetadataStoreBuilder;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
+import java.util.UUID;
+
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DB_CACHE_SIZE_DEFAULT;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DB_CACHE_SIZE_MB;
+import static org.apache.hadoop.ozone.OzoneConsts.SCM_PIPELINE_DB;
 
 /**
  * Utility class for benchmark test cases.
@@ -97,4 +120,77 @@ public final class GenesisUtil {
         .addPort(restPort);
     return builder.build();
   }
+
+  static StorageContainerManager getScm(OzoneConfiguration conf,
+      SCMConfigurator configurator) throws IOException,
+      AuthenticationException {
+    SCMStorageConfig scmStore = new SCMStorageConfig(conf);
+    if(scmStore.getState() != Storage.StorageState.INITIALIZED) {
+      String clusterId = UUID.randomUUID().toString();
+      String scmId = UUID.randomUUID().toString();
+      scmStore.setClusterId(clusterId);
+      scmStore.setScmId(scmId);
+      // writes the version file properties
+      scmStore.initialize();
+    }
+    return new StorageContainerManager(conf, configurator);
+  }
+
+  static void configureSCM(Configuration conf, int numHandlers) {
+    conf.set(ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY, "127.0.0.1:0");
+    conf.set(ScmConfigKeys.OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY, "127.0.0.1:0");
+    conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY, "127.0.0.1:0");
+    conf.set(ScmConfigKeys.OZONE_SCM_HTTP_ADDRESS_KEY, "127.0.0.1:0");
+    conf.setInt(ScmConfigKeys.OZONE_SCM_HANDLER_COUNT_KEY, numHandlers);
+  }
+
+  static void addPipelines(HddsProtos.ReplicationFactor factor,
+      int numPipelines, Configuration conf) throws IOException {
+    final File metaDir = ServerUtils.getScmDbDir(conf);
+    final File pipelineDBPath = new File(metaDir, SCM_PIPELINE_DB);
+    int cacheSize = conf.getInt(OZONE_SCM_DB_CACHE_SIZE_MB,
+        OZONE_SCM_DB_CACHE_SIZE_DEFAULT);
+    MetadataStore pipelineStore =
+        MetadataStoreBuilder.newBuilder().setCreateIfMissing(true)
+            .setConf(conf).setDbFile(pipelineDBPath)
+            .setCacheSize(cacheSize * OzoneConsts.MB).build();
+
+    List<DatanodeDetails> nodes = new ArrayList<>();
+    for (int i = 0; i < factor.getNumber(); i++) {
+      nodes
+          .add(GenesisUtil.createDatanodeDetails(UUID.randomUUID().toString()));
+    }
+    for (int i = 0; i < numPipelines; i++) {
+      Pipeline pipeline =
+          Pipeline.newBuilder()
+              .setState(Pipeline.PipelineState.OPEN)
+              .setId(PipelineID.randomId())
+              .setType(HddsProtos.ReplicationType.RATIS)
+              .setFactor(factor)
+              .setNodes(nodes)
+              .build();
+      pipelineStore.put(pipeline.getId().getProtobuf().toByteArray(),
+          pipeline.getProtobufMessage().toByteArray());
+    }
+
+    pipelineStore.close();
+  }
+
+  static OzoneManager getOm(OzoneConfiguration conf)
+      throws IOException, AuthenticationException {
+    OMStorage omStorage = new OMStorage(conf);
+    SCMStorageConfig scmStore = new SCMStorageConfig(conf);
+    if (omStorage.getState() != Storage.StorageState.INITIALIZED) {
+      omStorage.setClusterId(scmStore.getClusterID());
+      omStorage.setScmId(scmStore.getScmId());
+      omStorage.setOmId(UUID.randomUUID().toString());
+      omStorage.initialize();
+    }
+    return OzoneManager.createOm(null, conf);
+  }
+
+  static void configureOM(Configuration conf, int numHandlers) {
+    conf.set(OMConfigKeys.OZONE_OM_HTTP_ADDRESS_KEY, "127.0.0.1:0");
+    conf.setInt(OMConfigKeys.OZONE_OM_HANDLER_COUNT_KEY, numHandlers);
+  }
 }
diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
deleted file mode 100644
index cf25693db18..00000000000
--- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright containerOwnership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.ozone.scm;
-
-import org.apache.hadoop.hdds.HddsConfigKeys;
-import org.apache.hadoop.hdds.scm.container.ContainerManager;
-import org.apache.hadoop.hdds.scm.container.SCMContainerManager;
-import org.apache.hadoop.hdds.scm.events.SCMEvents;
-import org.apache.hadoop.hdds.scm.node.NodeManager;
-import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
-import org.apache.hadoop.hdds.scm.pipeline.SCMPipelineManager;
-import org.apache.hadoop.hdds.server.events.EventQueue;
-import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
-import org.apache.hadoop.hdds.scm.block.BlockManagerImpl;
-import org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicy;
-import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.hdds.scm.container.common.helpers.AllocatedBlock;
-import org.apache.hadoop.ozone.scm.cli.SQLCLI;
-import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.UUID;
-
-import static org.apache.hadoop.ozone.OzoneConsts.SCM_CONTAINER_DB;
-import static org.apache.hadoop.ozone.OzoneConsts.KB;
-import static org.junit.Assert.assertEquals;
-
-/**
- * This class tests the CLI that transforms container into SQLite DB files.
- */
-@RunWith(Parameterized.class)
-public class TestContainerSQLCli {
-
-  private EventQueue eventQueue;
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {OzoneConfigKeys.OZONE_METADATA_STORE_IMPL_LEVELDB},
-        {OzoneConfigKeys.OZONE_METADATA_STORE_IMPL_ROCKSDB}
-    });
-  }
-
-  private static String metaStoreType;
-
-  public TestContainerSQLCli(String type) {
-    metaStoreType = type;
-  }
-
-  private static SQLCLI cli;
-
-  private MiniOzoneCluster cluster;
-  private OzoneConfiguration conf;
-  private String datanodeIpAddress;
-
-  private ContainerManager containerManager;
-  private NodeManager nodeManager;
-  private BlockManagerImpl blockManager;
-
-  private HashMap<Long, Long> blockContainerMap;
-
-  private final static long DEFAULT_BLOCK_SIZE = 4 * KB;
-  private static HddsProtos.ReplicationFactor factor;
-  private static HddsProtos.ReplicationType type;
-  private static final String CONTAINER_OWNER = "OZONE";
-
-
-  @Before
-  public void setup() throws Exception {
-    blockContainerMap = new HashMap<>();
-
-    conf = new OzoneConfiguration();
-    conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 2);
-    conf.setClass(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY,
-        SCMContainerPlacementCapacity.class, ContainerPlacementPolicy.class);
-    if(conf.getBoolean(ScmConfigKeys.DFS_CONTAINER_RATIS_ENABLED_KEY,
-        ScmConfigKeys.DFS_CONTAINER_RATIS_ENABLED_DEFAULT)){
-      factor = HddsProtos.ReplicationFactor.THREE;
-      type = HddsProtos.ReplicationType.RATIS;
-    } else {
-      factor = HddsProtos.ReplicationFactor.ONE;
-      type = HddsProtos.ReplicationType.STAND_ALONE;
-    }
-    cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(2).build();
-    cluster.waitForClusterToBeReady();
-    datanodeIpAddress = cluster.getHddsDatanodes().get(0)
-        .getDatanodeDetails().getIpAddress();
-    cluster.getOzoneManager().stop();
-    cluster.getStorageContainerManager().stop();
-    eventQueue = new EventQueue();
-    nodeManager = cluster.getStorageContainerManager().getScmNodeManager();
-    PipelineManager pipelineManager =
-        new SCMPipelineManager(conf, nodeManager, eventQueue);
-    containerManager = new SCMContainerManager(conf, nodeManager,
-        pipelineManager, eventQueue);
-    blockManager =
-        new BlockManagerImpl(conf, cluster.getStorageContainerManager());
-    eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, blockManager);
-    eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false);
-    GenericTestUtils.waitFor(() -> {
-      return !blockManager.isScmInChillMode();
-    }, 10, 1000 * 15);
-    // blockManager.allocateBlock() will create containers if there is none
-    // stored in levelDB. The number of containers to create is the value of
-    // OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT which we set to 2.
-    // so the first allocateBlock() will create two containers. A random one
-    // is assigned for the block.
-
-    // loop until both the two datanodes are up, try up to about 4 seconds.
-    for (int c = 0; c < 40; c++) {
-      if (nodeManager.getAllNodes().size() == 2) {
-        break;
-      }
-      Thread.sleep(100);
-    }
-    assertEquals(2, nodeManager.getAllNodes().size());
-    AllocatedBlock ab1 = blockManager.allocateBlock(DEFAULT_BLOCK_SIZE, type,
-        factor, CONTAINER_OWNER);
-    blockContainerMap.put(ab1.getBlockID().getLocalID(),
-        ab1.getBlockID().getContainerID());
-
-    AllocatedBlock ab2;
-    // we want the two blocks on the two provisioned containers respectively,
-    // however blockManager picks containers randomly, keep retry until we
-    // assign the second block to the other container. This seems to be the only
-    // way to get the two containers.
-    // although each retry will create a block and assign to a container. So
-    // the size of blockContainerMap will vary each time the test is run.
-    while (true) {
-      ab2 = blockManager
-          .allocateBlock(DEFAULT_BLOCK_SIZE, type, factor, CONTAINER_OWNER);
-      blockContainerMap.put(ab2.getBlockID().getLocalID(),
-          ab2.getBlockID().getContainerID());
-      if (ab1.getBlockID().getContainerID() !=
-          ab2.getBlockID().getContainerID()) {
-        break;
-      }
-    }
-
-    blockManager.close();
-    containerManager.close();
-    nodeManager.close();
-
-    conf.set(OzoneConfigKeys.OZONE_METADATA_STORE_IMPL, metaStoreType);
-    cli = new SQLCLI(conf);
-
-  }
-
-  @After
-  public void shutdown() throws InterruptedException {
-    if (cluster != null) {
-      cluster.shutdown();
-    }
-  }
-
-  @Test
-  public void testConvertContainerDB() throws Exception {
-    String dbOutPath = GenericTestUtils.getTempPath(
-        UUID.randomUUID() + "/out_sql.db");
-    // TODO : the following will fail due to empty Datanode list, need to fix.
-    //String dnUUID = cluster.getDataNodes().get(0).getUuid();
-    String dbRootPath = conf.get(HddsConfigKeys.OZONE_METADATA_DIRS);
-    String dbPath = dbRootPath + "/" + SCM_CONTAINER_DB;
-    String[] args = {"-p", dbPath, "-o", dbOutPath};
-    Connection conn;
-    String sql;
-    ResultSet rs;
-
-    cli.run(args);
-
-    //verify the sqlite db
-    // only checks the container names are as expected. Because other fields
-    // such as datanode UUID are generated randomly each time
-    conn = connectDB(dbOutPath);
-    sql = "SELECT * FROM containerInfo";
-    rs = executeQuery(conn, sql);
-    ArrayList<Long> containerIDs = new ArrayList<>();
-    while (rs.next()) {
-      containerIDs.add(rs.getLong("containerID"));
-      //assertEquals(dnUUID, rs.getString("leaderUUID"));
-    }
-    /* TODO: fix this later when the SQLCLI is fixed.
-    assertTrue(containerIDs.size() == 2 &&
-        containerIDs.contains(pipeline1.getContainerName()) &&
-        containerIDs.contains(pipeline2.getContainerName()));
-
-    sql = "SELECT * FROM containerMembers";
-    rs = executeQuery(conn, sql);
-    containerIDs = new ArrayList<>();
-    while (rs.next()) {
-      containerIDs.add(rs.getLong("containerID"));
-      //assertEquals(dnUUID, rs.getString("datanodeUUID"));
-    }
-    assertTrue(containerIDs.size() == 2 &&
-        containerIDs.contains(pipeline1.getContainerName()) &&
-        containerIDs.contains(pipeline2.getContainerName()));
-
-    sql = "SELECT * FROM datanodeInfo";
-    rs = executeQuery(conn, sql);
-    int count = 0;
-    while (rs.next()) {
-      assertEquals(datanodeIpAddress, rs.getString("ipAddress"));
-      //assertEquals(dnUUID, rs.getString("datanodeUUID"));
-      count += 1;
-    }
-    // the two containers maybe on the same datanode, maybe not.
-    int expected = pipeline1.getLeader().getUuid().equals(
-        pipeline2.getLeader().getUuid())? 1 : 2;
-    assertEquals(expected, count);
-    */
-    Files.delete(Paths.get(dbOutPath));
-  }
-
-  private ResultSet executeQuery(Connection conn, String sql)
-      throws SQLException {
-    Statement stmt = conn.createStatement();
-    return stmt.executeQuery(sql);
-  }
-
-  private Connection connectDB(String dbPath) throws Exception {
-    Class.forName("org.sqlite.JDBC");
-    String connectPath =
-        String.format("jdbc:sqlite:%s", dbPath);
-    return DriverManager.getConnection(connectPath);
-  }
-}
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a5af081af92..e5bb46b0c33 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -465,6 +465,19 @@
         <type>test-jar</type>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-yarn-services-api</artifactId>
+        <version>${hadoop.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+        <version>${hadoop.version}</version>
+        <type>war</type>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.hadoop</groupId>
          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml
index e6641e351d6..4ce86bc7968 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -581,6 +581,7 @@
                     <exclude>**/azurebfs/ITestAzureBlobFileSystemE2EScale.java</exclude>
                     <exclude>**/azurebfs/ITestAbfsReadWriteAndSeek.java</exclude>
                     <exclude>**/azurebfs/ITestAzureBlobFileSystemListStatus.java</exclude>
+                    <exclude>**/azurebfs/extensions/ITestAbfsDelegationTokens.java</exclude>
                   </excludes>
 
                 </configuration>
@@ -619,6 +620,7 @@
                     <include>**/azurebfs/ITestAzureBlobFileSystemE2EScale.java</include>
                     <include>**/azurebfs/ITestAbfsReadWriteAndSeek.java</include>
                     <include>**/azurebfs/ITestAzureBlobFileSystemListStatus.java</include>
+                    <include>**/azurebfs/extensions/ITestAbfsDelegationTokens.java</include>
                   </includes>
                 </configuration>
               </execution>
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
index f8360432adb..a8e0ed3ef03 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
@@ -284,13 +284,13 @@ public class AzureBlobFileSystemStore implements Closeable {
     client.setFilesystemProperties(commaSeparatedProperties);
   }
 
-  public Hashtable<String, String> getPathProperties(final Path path) throws AzureBlobFileSystemException {
-    LOG.debug("getPathProperties for filesystem: {} path: {}",
+  public Hashtable<String, String> getPathStatus(final Path path) throws AzureBlobFileSystemException {
+    LOG.debug("getPathStatus for filesystem: {} path: {}",
             client.getFileSystem(),
            path);
 
     final Hashtable<String, String> parsedXmsProperties;
-    final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+    final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
 
     final String xMsProperties = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_PROPERTIES);
 
@@ -372,7 +372,7 @@ public class AzureBlobFileSystemStore implements Closeable {
             client.getFileSystem(),
             path);
 
-    final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+    final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
 
     final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE);
     final long contentLength = Long.parseLong(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH));
@@ -400,7 +400,7 @@ public class AzureBlobFileSystemStore implements Closeable {
             path,
             overwrite);
 
-    final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+    final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
 
     final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE);
     final Long contentLength = Long.valueOf(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH));
@@ -476,7 +476,7 @@ public class AzureBlobFileSystemStore implements Closeable {
               ? client.getAclStatus(AbfsHttpConstants.FORWARD_SLASH + AbfsHttpConstants.ROOT_PATH)
               : client.getFilesystemProperties();
     } else {
-      op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+      op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
     }
 
     final long blockSize = abfsConfiguration.getAzureBlockSize();
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
index ea665bd1f6f..c634c35e16e 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
@@ -348,7 +348,7 @@ public class AbfsClient implements Closeable {
     return op;
   }
 
-  public AbfsRestOperation getPathProperties(final String path, boolean isNameSpaceEnabled) throws AzureBlobFileSystemException {
+  public AbfsRestOperation getPathStatus(final String path) throws AzureBlobFileSystemException {
     final List<AbfsHttpHeader> requestHeaders = createDefaultHeaders();
 
     final AbfsUriQueryBuilder abfsUriQueryBuilder = createDefaultUriQueryBuilder();
@@ -356,7 +356,7 @@ public class AbfsClient implements Closeable {
 
     final URL url = createRequestUrl(path, abfsUriQueryBuilder.toString());
     final AbfsRestOperation op = new AbfsRestOperation(
-            isNameSpaceEnabled ? AbfsRestOperationType.GetPathProperties : AbfsRestOperationType.GetPathStatus,
+            AbfsRestOperationType.GetPathStatus,
             this,
             HTTP_METHOD_HEAD,
             url,
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
index e6b45c8f8b8..ba9b639adb6 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
@@ -78,7 +78,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest {
     touch(TEST_PATH);
     fs.getAbfsStore().setPathProperties(TEST_PATH, properties);
     Hashtable<String, String> fetchedProperties =
-            fs.getAbfsStore().getPathProperties(TEST_PATH);
+            fs.getAbfsStore().getPathStatus(TEST_PATH);
 
     assertEquals(properties, fetchedProperties);
   }
@@ -101,7 +101,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest {
     properties.put("key", "{ value: valueTest兩 }");
     touch(TEST_PATH);
     fs.getAbfsStore().setPathProperties(TEST_PATH, properties);
-    Hashtable<String, String> fetchedProperties = fs.getAbfsStore().getPathProperties(TEST_PATH);
+    Hashtable<String, String> fetchedProperties = fs.getAbfsStore().getPathStatus(TEST_PATH);
 
     assertEquals(properties, fetchedProperties);
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
index 832e98c6e24..486d20edcdb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -91,6 +91,12 @@
         </includes>
         <filtering>false</filtering>
       </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/jaxb.properties</include>
+        </includes>
+      </resource>
     </resources>
     <plugins>
       <plugin>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index a6d1dc5a4e3..fa75eb4025c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1659,9 +1659,6 @@ public class YarnConfiguration extends Configuration {
   public static final String NM_GPU_PATH_TO_EXEC =
       NM_GPU_RESOURCE_PREFIX + "path-to-discovery-executables";
 
-  @Private
-  public static final String DEFAULT_NM_GPU_PATH_TO_EXEC = "";
-
   /**
    * Settings to control which implementation of docker plugin for GPU will be
    * used.
@@ -1718,6 +1715,15 @@ public class YarnConfiguration extends Configuration {
   public static final String DEFAULT_NM_FPGA_VENDOR_PLUGIN =
       "org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.IntelFpgaOpenclPlugin";
 
+  @Private
+  public static final String NM_FPGA_DEVICE_DISCOVERY_SCRIPT =
+      NM_FPGA_RESOURCE_PREFIX + "device-discovery-script";
+
+  @Private
+  public static final String NM_FPGA_AVAILABLE_DEVICES =
+      NM_FPGA_RESOURCE_PREFIX + "available-devices";
+
+
   public static final String NM_NETWORK_TAG_PREFIX = NM_PREFIX
       + "network-tagging";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/resources/org/apache/hadoop/yarn/api/records/timeline/jaxb.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/resources/org/apache/hadoop/yarn/api/records/timeline/jaxb.properties
new file mode 100644
index 00000000000..8e545b31cc3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/resources/org/apache/hadoop/yarn/api/records/timeline/jaxb.properties
@@ -0,0 +1,13 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+javax.xml.bind.context.factory=org.apache.hadoop.yarn.server.applicationhistoryservice.webapp.ContextFactory
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md
new file mode 100644
index 00000000000..f048661708e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md
@@ -0,0 +1,50 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+# Apache Hadoop YARN Application Catalog
+
+## Introduction
+
+YARN Application Catalog is application catalog for
+deploying docker enabled cloud application on Hadoop.
+
+check it out:
+
+```bash
+git clone https://github.com/apache/hadoop.git
+```
+
+## Prerequisites
+* Firefox or Chrome
+* [npm](https://www.npmjs.org)
+* [nodejs](http://nodejs.org)
+* [JDK](http://www.oracle.com/technetwork/java/javaee/downloads/index.html)
+* [IDE](http://www.jetbrains.com/)
+* [bower](http://bower.io)
+* [PhantomJs](http://phantomjs.org) or `brew install phantomjs`
+* [Docker](http://docker.io)
+
+## Installation
+
+```bash
+mvn package
+```
+
+When running this command a couple of things happen:
+* YARN Application Catalog web application is built
+* YARN Application Docker image is built
+
+## Status of the project
+
+See Apache [JIRA](http://issues.apache.org/jira/browse/HADOOP)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
new file mode 100644
index 00000000000..2661f598116
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM centos:7
+
+RUN yum -y install tomcat lsof krb5-workstation sssd-client curl
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN mkdir -p /opt/apache/solr && \
+    curl -SL http://archive.apache.org/dist/lucene/solr/6.6.0/solr-6.6.0.tgz | \
+    tar -xzC /opt/apache/solr --strip 1
+COPY src/main/scripts/setup-image.sh /setup-image.sh
+COPY src/main/resources/samples.xml /tmp/samples.xml
+COPY src/main/resources/jaas.config /etc/tomcat/jaas.config.template
+COPY src/main/scripts/entrypoint.sh /usr/bin/entrypoint.sh
+COPY target/ROOT.war /var/lib/tomcat/webapps/ROOT.war
+RUN chmod 755 /setup-image.sh
+RUN chmod 755 /usr/bin/entrypoint.sh
+RUN /setup-image.sh
+
+EXPOSE 8080
+EXPOSE 8983
+WORKDIR /
+
+ENTRYPOINT ["/usr/bin/entrypoint.sh" ]
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md
new file mode 100644
index 00000000000..1e2d12bba64
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md
@@ -0,0 +1,43 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+# Apache Hadoop YARN AppCatalog Docker Image
+
+## Introduction
+
+AppCatalog Docker image is pre-packaged docker container for Hadoop Application Catalog.
+
+check it out:
+
+```
+git clone https://github.com/apache/hadoop.git
+```
+
+## Compile
+
+```
+mvn package
+```
+
+## Run
+
+```
+docker run -d -p 8080:8080 -p 8983:8983 hadoop/appcatalog-docker:1.0-SNAPSHOT
+```
+
+When running this command a couple of things happens:
+* Solr server will create appcatalog collection for hosting application catalog
+* Sample applications are registered in Embedded Solr
+* Tomcat will run appcatalog-webapp on port 8080
+
+User can browse port 8080 to deploy application on a Hadoop cluster.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
new file mode 100644
index 00000000000..40e3278f066
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-yarn-applications-catalog-docker</artifactId>
+  <packaging>pom</packaging>
+
+  <parent>
+    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+    <groupId>org.apache.hadoop</groupId>
+    <version>3.3.0-SNAPSHOT</version>
+  </parent>
+
+  <name>YARN Application Catalog Docker Image</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>src/main/resources/jaas.config</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <activation>
+        <file>
+          <exists>/var/run/docker.sock</exists>
+        </file>
+        <os><family>linux</family></os>
+      </activation>
+      <id>application-catalog-docker-image</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+              <execution>
+                <id>copy-dependencies</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.hadoop</groupId>
+                      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+                      <version>${project.version}</version>
+                      <destFileName>ROOT.war</destFileName>
+                      <type>war</type>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <overWriteReleases>false</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                  <excludeTransitive>true</excludeTransitive>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>dockerfile-maven-plugin</artifactId>
+            <version>1.3.4</version>
+            <executions>
+              <execution>
+                <id>default</id>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <repository>apache/hadoop-yarn-applications-catalog-docker</repository>
+              <tag>${project.version}</tag>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config
new file mode 100644
index 00000000000..937df572bd2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config
@@ -0,0 +1,9 @@
+com.sun.security.jgss.krb5.initiate {
+  com.sun.security.auth.module.Krb5LoginModule required
+  doNotPrompt=true
+  principal="${PRINCIPAL}"
+  useKeyTab=true
+  keyTab="${KEYTAB}"
+  storeKey=true
+  useTicketCache=false;
+};
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml
new file mode 100644
index 00000000000..5389cfb5276
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<add>
+  <doc>
+    <field name="id">appStore_1</field>
+    <field name="type_s">AppStoreEntry</field>
+    <field name="org_s">Apache</field>
+    <field name="name_s">Http Server Project</field>
+    <field name="desc_s">The Number One HTTP Server On The Internet</field>
+    <field name="like_i">50000</field>
+    <field name="download_i">100000</field>
+    <field name="yarnfile_s">{
+  "name": "httpd",
+  "version": "1.0",
+  "components" :
+  [
+    {
+      "name": "httpd",
+      "number_of_containers": 2,
+      "artifact": {
+        "id": "centos/httpd-24-centos7:latest",
+        "type": "DOCKER"
+      },
+      "resource": {
+        "cpus": 1,
+        "memory": "256"
+      },
+      "configuration": {
+        "env": {
+          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"8080:8080"
+        },
+        "properties": {
+        }
+      }
+    }
+  ],
+  "quicklinks": {
+    "Httpd UI": "http://httpd.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+  }
+}
+    </field>
+  </doc>
+  <doc>
+    <field name="id">appStore_2</field>
+    <field name="type_s">AppStoreEntry</field>
+    <field name="org_s">Jenkins-ci.org</field>
+    <field name="name_s">Jenkins</field>
+    <field name="desc_s">The leading open source automation server</field>
+    <field name="like_i">100000</field>
+    <field name="download_i">1000000</field>
+    <field name="yarnfile_s">{
+  "name": "httpd",
+  "version": "1.0",
+  "components" :
+  [
+    {
+      "name": "jenkins",
+      "number_of_containers": 1,
+      "artifact": {
+        "id": "jenkins/jenkins:latest",
+        "type": "DOCKER"
+      },
+      "resource": {
+        "cpus": 1,
+        "memory": "1024"
+      },
+      "run_privileged_container": true,
+      "configuration": {
+        "env": {
+          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"8080:8080"
+        },
+        "properties": {
+        }
+      }
+    }
+  ],
+  "quicklinks": {
+    "Jenkins UI": "http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+  }
+}
+    </field>
+  </doc>
+  <doc>
+    <field name="id">appStore_3</field>
+    <field name="type_s">AppStoreEntry</field>
+    <field name="org_s">Docker</field>
+    <field name="name_s">Registry</field>
+    <field name="desc_s">The Docker Registry 2.0 implementation for storing and distributing Docker images.</field>
+    <field name="like_i">360</field>
+    <field name="download_i">1</field>
+    <field name="yarnfile_s">{
+  "name": "docker-registry",
+  "version": "1.0",
+  "components" :
+  [
+    {
+      "name": "registry",
+      "number_of_containers": 1,
+      "artifact": {
+        "id": "registry:latest",
+        "type": "DOCKER"
+      },
+      "resource": {
+        "cpus": 1,
+        "memory": "1024"
+      },
+      "configuration": {
+        "env": {
+          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"5000:5000"
+        },
+        "properties": {
+        }
+      }
+    }
+  ]
+}
+    </field>
+  </doc>
+</add>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh
new file mode 100755
index 00000000000..1666063f5a1
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+template_generator() {
+  REGEX='(\$\{[a-zA-Z_][a-zA-Z_0-9]*\})'
+  if [ -e "$2" ]; then
+    mv -f "$2" "$2.bak"
+  fi
+  while IFS='' read -r line || [[ -n "$line" ]]; do
+    while [[ "$line" =~ $REGEX ]] ; do
+      LHS=${BASH_REMATCH[1]}
+      RHS="$(eval echo "\"$LHS\"")"
+      line=${line//$LHS/$RHS}
+    done
+    echo "$line" >> "$2"
+  done < "$1"
+}
+
+export JAVA_HOME=/usr/lib/jvm/jre
+export HADOOP_CONF_DIR=/etc/hadoop/conf
+/opt/apache/solr/bin/solr start -p 8983 -force
+/opt/apache/solr/bin/solr create_core -c appcatalog -force
+/opt/apache/solr/bin/post -c appcatalog /tmp/samples.xml
+if [ -d /etc/hadoop/conf ]; then
+  sed -i.bak 's/shared.loader=.*$/shared.loader=\/etc\/hadoop\/conf/g' /etc/tomcat/catalina.properties
+fi
+if [ -e "$KEYTAB" ]; then
+  export JAVA_OPTS="$JAVA_OPTS -Djava.security.auth.login.config=/etc/tomcat/jaas.config -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false"
+  template_generator /etc/tomcat/jaas.config.template /etc/tomcat/jaas.config
+fi
+/usr/libexec/tomcat/server start
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh
new file mode 100755
index 00000000000..879e391b974
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+mkdir -p /etc/hadoop
+chmod -R 777 /opt/apache/solr/server/logs /var/log/tomcat /var/cache/tomcat /var/lib/tomcat/webapps /opt/apache/solr/server/solr
+chmod 777 /etc/tomcat
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
new file mode 100644
index 00000000000..2d8667ea022
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
@@ -0,0 +1,5 @@
+.classpath
+.project
+/target/
+/node_modules/
+yarn.lock
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc
new file mode 100644
index 00000000000..e0ca4e9145e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc
@@ -0,0 +1 @@
+--modules-folder target/generated-sources/vendor
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md
new file mode 100644
index 00000000000..58fe29f86d8
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md
@@ -0,0 +1,51 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+# Apache Hadoop YARN Application Catalog
+
+## Introduction
+
+Hadoop YARN Application Catalog is application catalog for
+deploying docker enabled cloud application on Hadoop.
+
+check it out:
+
+```bash
+git clone https://github.com/apache/hadoop.git
+```
+
+## Prerequisites
+* Firefox or Chrome
+* [npm](https://www.npmjs.org)
+* [nodejs](http://nodejs.org)
+* [JDK](http://www.oracle.com/technetwork/java/javaee/downloads/index.html)
+* [IDE](http://www.jetbrains.com/)
+* [bower](http://bower.io)
+* [PhantomJs](http://phantomjs.org) or `brew install phantomjs`
+* [Application Server](https://glassfish.java.net/download.html) or `brew install glassfish`
+
+## Installation
+
+```bash
+mvn package
+```
+
+When running this command a couple of things happen:
+* Npm and yarnpkg install will be run
+* JSLint will be run in src/main/javascript sources
+* Javascript will be minified
+* All the other standard maven phases.
+
+## Status of the project
+
+See Apache [JIRA](http://issues.apache.org/jira/browse/YARN)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml
new file mode 100644
index 00000000000..b89146a264a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<FindBugsFilter>
+
+</FindBugsFilter>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
new file mode 100644
index 00000000000..65a6ace6a2f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
@@ -0,0 +1,25 @@
+{
+    "name": "AppCatalog",
+    "private": true,
+    "version": "0.0.0",
+    "description": "YARN App Catalog",
+    "repository": "git://git.apache.org/hadoop.git",
+    "license": "Apache 2.0",
+    "dependencies": {
+        "jquery": "3.3.1",
+        "angular-loader": "~1.6.4",
+        "angular-mocks": "~1.6.4",
+        "angular-route": "~1.6.4",
+        "angular": "~1.6.4",
+        "bootstrap": "~3.3.7"
+    },
+    "devDependencies": {
+        "requirejs": "^2.1.0",
+        "shelljs": "^0.2.6",
+        "apidoc": "0.17.7"
+    },
+    "scripts": {
+        "prestart": "npm install & mvn clean package",
+        "pretest": "npm install"
+    }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
new file mode 100644
index 00000000000..41232a3a6bb
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+  <packaging>war</packaging>
+
+  <parent>
+    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+    <groupId>org.apache.hadoop</groupId>
+    <version>3.3.0-SNAPSHOT</version>
+  </parent>
+
+  <name>YARN Application Catalog Webapp</name>
+
+  <url>http://hadoop.apache.org</url>
+
+    <properties>
+        <artifact.name>app</artifact.name>
+        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+        <vendor.loc>target/generated-sources/vendor</vendor.loc>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <dependency.locations.enabled>false</dependency.locations.enabled>
+
+        <powermock.version>1.5.6</powermock.version>
+        <solr.version>6.3.0</solr.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>io.swagger</groupId>
+          <artifactId>swagger-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>${powermock.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-all</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>7.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>2.12</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                    <artifactId>jackson-jaxrs-base</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-io</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-test-framework</artifactId>
+            <version>${solr.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-io</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-auth</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-services-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-services-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+            <version>${jackson2.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${artifact.name}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/javascript</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.6</version>
+                <configuration>
+                    <workingDirectory>target</workingDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install node and yarn</id>
+                        <goals>
+                            <goal>install-node-and-yarn</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <nodeVersion>v8.11.3</nodeVersion>
+                            <yarnVersion>v1.7.0</yarnVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn install</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArguments>
+                        <endorseddirs>${endorsed.dir}</endorseddirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <log4j.configuration>file:${project.build.testOutputDirectory}/log4j.properties</log4j.configuration>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <webResources>
+                        <resource>
+                            <directory>target/generated-sources</directory>
+                            <includes>
+                                <include>vendor/jquery/**</include>
+                                <include>vendor/angular/**</include>
+                                <include>vendor/angular-route/**</include>
+                                <include>vendor/bootstrap/**</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${endorsed.dir}</outputDirectory>
+                            <silent>true</silent>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>javax</groupId>
+                                    <artifactId>javaee-endorsed-api</artifactId>
+                                    <version>7.0</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>compress-js</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <!--<goal>jslint</goal>-->
+                            <goal>compress</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <failOnWarning>true</failOnWarning>
+                    <!--<outputDirectory>src/main/webapp/js</outputDirectory>-->
+                    <outputDirectory>target/${artifact.name}/js</outputDirectory>
+                    <nosuffix>true</nosuffix>
+                    <excludes>
+                        <exclude>**/js/**/*js</exclude>
+                        <exclude>vendor/**</exclude>
+                        <exclude>**/*min.css</exclude>
+                        <exclude>**/*min.js</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.klieber</groupId>
+                <artifactId>phantomjs-maven-plugin</artifactId>
+                <version>0.7</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>install</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <version>2.1.1</version>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.searls</groupId>
+                <artifactId>jasmine-maven-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test</goal>
+                            <goal>bdd</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
+                    <webDriverCapabilities>
+                        <capability>
+                            <name>phantomjs.binary.path</name>
+                            <value>${phantomjs.binary}</value>
+                        </capability>
+                    </webDriverCapabilities>
+                    <preloadSources>
+                        <source>${vendor.loc}/jquery/dist/jquery.js</source>
+                        <source>${vendor.loc}/angular/angular.min.js</source>
+                        <source>${vendor.loc}/angular-route/angular-route.min.js</source>
+                        <source>${vendor.loc}/angular-mocks/angular-mocks.js</source>
+                    </preloadSources>
+                    <jsSrcDir>src/main/javascript</jsSrcDir>
+                    <jsTestSrcDir>src/test/javascript</jsTestSrcDir>
+                    <specIncludes>
+                        <include>*Spec.js</include>
+                    </specIncludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>node</directory>
+                        </fileset>
+                        <fileset>
+                            <directory>node_modules</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>src/main/webapp/vendor/**</exclude>
+                        <exclude>src/main/resources/appcatalog.properties</exclude>
+                        <exclude>src/main/webapp//**/*.svg</exclude>
+                        <exclude>src/test/javascript/karma.conf.js</exclude>
+                        <exclude>src/test/resources/configsets/exampleCollection/conf/params.json</exclude>
+                        <exclude>src/test/resources/log4j.properties</exclude>
+                        <exclude>src/test/resources/jaas.config</exclude>
+                        <exclude>.bowerrc</exclude>
+                        <exclude>.yarnrc</exclude>
+                        <exclude>bower.json</exclude>
+                        <exclude>package.json</exclude>
+                        <exclude>yarn.lock</exclude>
+                        <exclude>node/**</exclude>
+                        <exclude>node_modules/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>org.apache.hadoop.yarn.appcatalog</excludePackageNames>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+<!--
+    <profiles>
+      <profile>
+        <id>rest-docs</id>
+        <activation>
+          <file>
+            <exists>${basedir}/node_modules/.bin/apidoc</exists>
+          </file>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.3.2</version>
+              <executions>
+                <execution>
+                  <id>apidocs</id>
+                  <phase>package</phase>
+                  <goals>
+                    <goal>exec</goal>
+                  </goals>
+                  <configuration>
+                    <outputFile>${project.build.directory}/apidocs.log</outputFile>
+                    <executable>${basedir}/node/node</executable>
+                    <commandlineArgs>${basedir}/node_modules/.bin/apidoc -i src/main/java -o ${project.build.directory}/site/apidocs</commandlineArgs>
+                    <silent>true</silent>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+    </profiles>
+-->
+
+    <reporting>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.9</version>
+        </plugin>
+      </plugins>
+    </reporting>
+
+</project>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java
new file mode 100644
index 00000000000..07e3a6ff6a1
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.application;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+import org.apache.hadoop.yarn.appcatalog.controller.AppDetailsController;
+
+import java.util.Set;
+
+/**
+ * Jackson resource configuration class for Application Catalog.
+ */
+@ApplicationPath("service")
+public class AppCatalog extends Application {
+
+  @Override
+  public Set<Class<?>> getClasses() {
+    final Set<Class<?>> resources = new java.util.HashSet<>();
+    // following code can be used to customize Jersey 2.0 JSON provider:
+    try {
+      final Class<?> jsonProvider =
+          Class.forName("org.glassfish.jersey.jackson.JacksonFeature");
+      // Class jsonProvider =
+      // Class.forName("org.glassfish.jersey.moxy.json.MoxyJsonFeature");
+      // Class jsonProvider =
+      // Class.forName("org.glassfish.jersey.jettison.JettisonFeature");
+      resources.add(jsonProvider);
+    } catch (final ClassNotFoundException ex) {
+      ex.printStackTrace();
+    }
+    addRestResourceClasses(resources);
+    return resources;
+  }
+
+  /**
+   * Add your own resources here.
+   */
+  private void addRestResourceClasses(final Set<Class<?>> resources) {
+    resources.add(AppDetailsController.class);
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java
new file mode 100644
index 00000000000..1397722acb6
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java
@@ -0,0 +1,359 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.application;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+import org.apache.hadoop.yarn.appcatalog.model.Application;
+import org.apache.hadoop.yarn.appcatalog.utils.RandomWord;
+import org.apache.hadoop.yarn.appcatalog.utils.WordLengthException;
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.client.solrj.response.UpdateResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrInputDocument;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Driver class for accessing Solr.
+ */
+public class AppCatalogSolrClient {
+
+  private static final Log LOG = LogFactory.getLog(AppCatalogSolrClient.class);
+  private static String urlString;
+
+  public AppCatalogSolrClient() {
+    // Locate Solr URL
+    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+    InputStream input =
+        classLoader.getResourceAsStream("appcatalog.properties");
+    Properties properties = new Properties();
+    try {
+      properties.load(input);
+      urlString = properties.getProperty("solr_url");
+    } catch (IOException e) {
+      LOG.error("Error reading appcatalog configuration: ", e);
+    }
+  }
+
+  public SolrClient getSolrClient() {
+    return new HttpSolrClient.Builder(urlString).build();
+  }
+
+  public List<AppStoreEntry> getRecommendedApps() {
+    List<AppStoreEntry> apps = new ArrayList<AppStoreEntry>();
+    SolrClient solr = getSolrClient();
+    SolrQuery query = new SolrQuery();
+    query.setQuery("*:*");
+    query.setFilterQueries("type_s:AppStoreEntry");
+    query.setRows(40);
+    QueryResponse response;
+    try {
+      response = solr.query(query);
+      Iterator<SolrDocument> list = response.getResults().listIterator();
+      while (list.hasNext()) {
+        SolrDocument d = list.next();
+        AppStoreEntry entry = new AppStoreEntry();
+        entry.setId(d.get("id").toString());
+        entry.setOrg(d.get("org_s").toString());
+        entry.setName(d.get("name_s").toString());
+        entry.setDesc(d.get("desc_s").toString());
+        if (d.get("icon_s")!=null) {
+          entry.setIcon(d.get("icon_s").toString());
+        }
+        entry.setLike(Integer.valueOf(d.get("like_i").toString()));
+        entry.setDownload(Integer.valueOf(d.get("download_i").toString()));
+        apps.add(entry);
+      }
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error getting a list of recommended applications: ", e);
+    }
+    return apps;
+  }
+
+  public List<AppStoreEntry> search(String keyword) {
+    List<AppStoreEntry> apps = new ArrayList<AppStoreEntry>();
+    SolrClient solr = getSolrClient();
+    SolrQuery query = new SolrQuery();
+    if (keyword.length()==0) {
+      query.setQuery("*:*");
+      query.setFilterQueries("type_s:AppStoreEntry");
+    } else {
+      query.setQuery(keyword);
+      query.setFilterQueries("type_s:AppStoreEntry");
+    }
+    query.setRows(40);
+    QueryResponse response;
+    try {
+      response = solr.query(query);
+      Iterator<SolrDocument> list = response.getResults().listIterator();
+      while (list.hasNext()) {
+        SolrDocument d = list.next();
+        AppStoreEntry entry = new AppStoreEntry();
+        entry.setId(d.get("id").toString());
+        entry.setOrg(d.get("org_s").toString());
+        entry.setName(d.get("name_s").toString());
+        entry.setDesc(d.get("desc_s").toString());
+        entry.setLike(Integer.valueOf(d.get("like_i").toString()));
+        entry.setDownload(Integer.valueOf(d.get("download_i").toString()));
+        apps.add(entry);
+      }
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error in searching for applications: ", e);
+    }
+    return apps;
+  }
+
+  public List<AppEntry> listAppEntries() {
+    List<AppEntry> list = new ArrayList<AppEntry>();
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    SolrClient solr = getSolrClient();
+    SolrQuery query = new SolrQuery();
+    query.setQuery("*:*");
+    query.setFilterQueries("type_s:AppEntry");
+    query.setRows(40);
+    QueryResponse response;
+    try {
+      response = solr.query(query);
+      Iterator<SolrDocument> appList = response.getResults().listIterator();
+      while (appList.hasNext()) {
+        SolrDocument d = appList.next();
+        AppEntry entry = new AppEntry();
+        entry.setId(d.get("id").toString());
+        entry.setName(d.get("name_s").toString());
+        entry.setApp(d.get("app_s").toString());
+        entry.setYarnfile(mapper.readValue(d.get("yarnfile_s").toString(),
+            Service.class));
+        list.add(entry);
+      }
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error in listing deployed applications: ", e);
+    }
+    return list;
+  }
+
+  public AppStoreEntry findAppStoreEntry(String id) {
+    AppStoreEntry entry = new AppStoreEntry();
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    SolrClient solr = getSolrClient();
+    SolrQuery query = new SolrQuery();
+    query.setQuery("id:" + id);
+    query.setFilterQueries("type_s:AppStoreEntry");
+    query.setRows(1);
+
+    QueryResponse response;
+    try {
+      response = solr.query(query);
+      Iterator<SolrDocument> appList = response.getResults().listIterator();
+      while (appList.hasNext()) {
+        SolrDocument d = appList.next();
+        entry.setId(d.get("id").toString());
+        entry.setOrg(d.get("org_s").toString());
+        entry.setName(d.get("name_s").toString());
+        entry.setDesc(d.get("desc_s").toString());
+        entry.setLike(Integer.valueOf(d.get("like_i").toString()));
+        entry.setDownload(Integer.valueOf(d.get("download_i").toString()));
+        Service yarnApp = mapper.readValue(d.get("yarnfile_s").toString(),
+            Service.class);
+        String name;
+        try {
+          Random r = new Random();
+          int low = 3;
+          int high = 10;
+          int seed = r.nextInt(high-low) + low;
+          int seed2 = r.nextInt(high-low) + low;
+          name = RandomWord.getNewWord(seed).toLowerCase() + "-" + RandomWord
+              .getNewWord(seed2).toLowerCase();
+        } catch (WordLengthException e) {
+          name = "c" + java.util.UUID.randomUUID().toString().substring(0, 11);
+        }
+        yarnApp.setName(name);
+        entry.setApp(yarnApp);
+      }
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error in finding deployed application: " + id, e);
+    }
+    return entry;
+  }
+
+  public AppEntry findAppEntry(String id) {
+    AppEntry entry = new AppEntry();
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    SolrClient solr = getSolrClient();
+    SolrQuery query = new SolrQuery();
+    query.setQuery("id:" + id);
+    query.setFilterQueries("type_s:AppEntry");
+    query.setRows(1);
+
+    QueryResponse response;
+    try {
+      response = solr.query(query);
+      Iterator<SolrDocument> appList = response.getResults().listIterator();
+      while (appList.hasNext()) {
+        SolrDocument d = appList.next();
+        entry.setId(d.get("id").toString());
+        entry.setApp(d.get("app_s").toString());
+        entry.setName(d.get("name_s").toString());
+        entry.setYarnfile(mapper.readValue(d.get("yarnfile_s").toString(),
+            Service.class));
+      }
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error in finding deployed application: " + id, e);
+    }
+    return entry;
+  }
+
+  public void deployApp(String id, Service service) throws SolrServerException,
+      IOException {
+    long download = 0;
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+    SolrClient solr = getSolrClient();
+    // Find application information from AppStore
+    SolrQuery query = new SolrQuery();
+    query.setQuery("id:" + id);
+    query.setFilterQueries("type_s:AppStoreEntry");
+    query.setRows(1);
+    QueryResponse response = solr.query(query);
+    Iterator<SolrDocument> appList = response.getResults().listIterator();
+    AppStoreEntry entry = new AppStoreEntry();
+    while (appList.hasNext()) {
+      SolrDocument d = appList.next();
+      entry.setOrg(d.get("org_s").toString());
+      entry.setName(d.get("name_s").toString());
+      entry.setDesc(d.get("desc_s").toString());
+      entry.setLike(Integer.valueOf(d.get("like_i").toString()));
+      entry.setDownload(Integer.valueOf(d.get("download_i").toString()));
+      download = entry.getDownload() + 1;
+
+      // Update download count
+      docs.add(incrementDownload(d, download));
+    }
+
+    // increment download count for application
+
+    if (service!=null) {
+      // Register deployed application instance with AppList
+      SolrInputDocument request = new SolrInputDocument();
+      String name = service.getName();
+      request.addField("type_s", "AppEntry");
+      request.addField("id", name);
+      request.addField("name_s", name);
+      request.addField("app_s", entry.getOrg()+"/"+entry.getName());
+      request.addField("yarnfile_s", mapper.writeValueAsString(service));
+      docs.add(request);
+    }
+
+    // Commit Solr changes.
+    UpdateResponse detailsResponse = solr.add(docs);
+    if (detailsResponse.getStatus() != 0) {
+      throw new IOException("Unable to register docker instance "
+          + "with application entry.");
+    }
+    solr.commit();
+  }
+
+  private SolrInputDocument incrementDownload(SolrDocument doc,
+      long download) {
+    Collection<String> names = doc.getFieldNames();
+    SolrInputDocument s = new SolrInputDocument();
+    for (String name : names) {
+      if(!name.equals("_version_")) {
+        s.addField(name, doc.getFieldValues(name));
+      }
+    }
+    s.setField("download_i", download++);
+    return s;
+  }
+
+  public void deleteApp(String id) {
+    SolrClient solr = getSolrClient();
+    try {
+      solr.deleteById(id);
+      solr.commit();
+    } catch (SolrServerException | IOException e) {
+      LOG.error("Error in removing deployed application: "+id, e);
+    }
+  }
+
+  public void register(Application app) throws IOException {
+    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+    SolrClient solr = getSolrClient();
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    try {
+      SolrInputDocument buffer = new SolrInputDocument();
+      buffer.setField("id", java.util.UUID.randomUUID().toString()
+          .substring(0, 11));
+      buffer.setField("org_s", app.getOrganization());
+      buffer.setField("name_s", app.getName());
+      buffer.setField("desc_s", app.getDescription());
+      if (app.getIcon() != null) {
+        buffer.setField("icon_s", app.getIcon());
+      }
+      buffer.setField("type_s", "AppStoreEntry");
+      buffer.setField("like_i", 0);
+      buffer.setField("download_i", 0);
+
+      // Keep only YARN data model for yarnfile field
+      String yarnFile = mapper.writeValueAsString(app);
+      LOG.info("app:"+yarnFile);
+      Service yarnApp = mapper.readValue(yarnFile, Service.class);
+      buffer.setField("yarnfile_s", mapper.writeValueAsString(yarnApp));
+
+      docs.add(buffer);
+      // Commit Solr changes.
+      UpdateResponse detailsResponse = solr.add(docs);
+      if (detailsResponse.getStatus() != 0) {
+        throw new IOException("Unable to register application " +
+            "in Application Store.");
+      }
+      solr.commit();
+    } catch (SolrServerException | IOException e) {
+      throw new IOException("Unable to register application " +
+          "in Application Store. "+ e.getMessage());
+    }
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnClient.java
new file mode 100644
index 00000000000..43846ee0a78
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnClient.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.application;
+
+import java.io.IOException;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.hadoop.yarn.service.api.records.KerberosPrincipal;
+import org.apache.hadoop.yarn.service.client.ApiServiceClient;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.jersey.api.client.ClientHandlerException;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+
+/**
+ * Driver class for calling YARN Resource Manager REST API.
+ */
+public class YarnClient {
+
+  private static final Log LOG = LogFactory.getLog(YarnClient.class);
+  private static Configuration conf = new Configuration();
+  private static ClientConfig getClientConfig() {
+    ClientConfig config = new DefaultClientConfig();
+    config.getProperties().put(ClientConfig.PROPERTY_CHUNKED_ENCODING_SIZE, 0);
+    config.getProperties()
+        .put(ClientConfig.PROPERTY_BUFFER_RESPONSE_ENTITY_ON_EXCEPTION, true);
+    return config;
+  }
+
+  private ApiServiceClient asc;
+
+  public YarnClient() {
+    try {
+      asc = new ApiServiceClient(conf);
+    } catch (Exception e) {
+      LOG.error("Error initialize YARN Service Client: {}", e);
+    }
+  }
+
+  public void createApp(Service app) {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    ClientResponse response;
+    try {
+      boolean useKerberos = UserGroupInformation.isSecurityEnabled();
+      if (useKerberos) {
+        KerberosPrincipal kerberos = new KerberosPrincipal();
+        String[] temp = System.getenv("PRINCIPAL").split("@");
+        String[] temp2 = temp[0].split("/");
+        StringBuilder sb = new StringBuilder();
+        sb.append(temp2[0]);
+        sb.append("/");
+        sb.append("_HOST");
+        sb.append("@");
+        sb.append(temp[1]);
+        String keytab = System.getenv("KEYTAB");
+        if (!keytab.startsWith("file://")) {
+          keytab = "file://" + keytab;
+        }
+        kerberos.setPrincipalName(sb.toString());
+        kerberos.setKeytab(keytab);
+        app.setKerberosPrincipal(kerberos);
+      }
+      response = asc.getApiClient().post(ClientResponse.class,
+          mapper.writeValueAsString(app));
+      if (response.getStatus() >= 299) {
+        String message = response.getEntity(String.class);
+        throw new RuntimeException("Failed : HTTP error code : "
+            + response.getStatus() + " error: " + message);
+      }
+    } catch (UniformInterfaceException | ClientHandlerException
+        | IOException e) {
+      LOG.error("Error in deploying application: ", e);
+    }
+  }
+
+  public void deleteApp(String appInstanceId) {
+    ClientResponse response;
+    try {
+      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+          .delete(ClientResponse.class);
+      if (response.getStatus() >= 299) {
+        String message = response.getEntity(String.class);
+        throw new RuntimeException("Failed : HTTP error code : "
+            + response.getStatus() + " error: " + message);
+      }
+    } catch (UniformInterfaceException | ClientHandlerException
+        | IOException e) {
+      LOG.error("Error in deleting application: ", e);
+    }
+  }
+
+  public void restartApp(Service app) throws JsonProcessingException {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    String appInstanceId = app.getName();
+    String yarnFile = mapper.writeValueAsString(app);
+    ClientResponse response;
+    try {
+      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+          .put(ClientResponse.class, yarnFile);
+      if (response.getStatus() >= 299) {
+        String message = response.getEntity(String.class);
+        throw new RuntimeException("Failed : HTTP error code : "
+            + response.getStatus() + " error: " + message);
+      }
+    } catch (UniformInterfaceException | ClientHandlerException
+        | IOException e) {
+      LOG.error("Error in restarting application: ", e);
+    }
+  }
+
+  public void stopApp(Service app) throws JsonProcessingException {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    String appInstanceId = app.getName();
+    String yarnFile = mapper.writeValueAsString(app);
+    ClientResponse response;
+    try {
+      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+          .put(ClientResponse.class, yarnFile);
+      if (response.getStatus() >= 299) {
+        String message = response.getEntity(String.class);
+        throw new RuntimeException("Failed : HTTP error code : "
+            + response.getStatus() + " error: " + message);
+      }
+    } catch (UniformInterfaceException | ClientHandlerException
+        | IOException e) {
+      LOG.error("Error in stopping application: ", e);
+    }
+  }
+
+  public void getStatus(AppEntry entry) {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    String appInstanceId = entry.getName();
+    Service app = null;
+    try {
+      String yarnFile = asc.getApiClient(asc.getServicePath(appInstanceId))
+          .get(String.class);
+      app = mapper.readValue(yarnFile, Service.class);
+      entry.setYarnfile(app);
+    } catch (UniformInterfaceException | IOException e) {
+      LOG.error("Error in fetching application status: ", e);
+    }
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java
new file mode 100644
index 00000000000..e8077cacc44
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+/**
+ * Application Catalog.
+ */
+package org.apache.hadoop.yarn.appcatalog.application;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java
new file mode 100644
index 00000000000..34bf17d47ba
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java
@@ -0,0 +1,265 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+import org.apache.hadoop.yarn.appcatalog.application.YarnClient;
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.hadoop.yarn.service.api.records.ServiceState;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+/**
+ * Application catalog REST API for displaying application details.
+ */
+@Path("/app_details")
+public class AppDetailsController {
+
+  public AppDetailsController() {
+  }
+
+  /**
+   * List detail information about the deployed application.
+   *
+   * @apiGroup AppDetailController
+   * @apiName getDetails
+   * @api {get} /app_details/config/{id}  Check config of application instance.
+   * @apiParam {String} id Application ID to fetch configuration.
+   * @apiSuccess {Object} AppEntry Application configuration.
+   * @apiSuccessExample {json} Success-Response:
+   *     HTTP/1.1 200 OK
+   *     {
+   *       "id":"howita_man",
+   *        "name":"howita_man",
+   *        "app":"Jenkins-ci.org/Jenkins",
+   *        "yarnfile":{
+   *           "name":"howita_man",
+   *           "lifetime":3600,
+   *           "containers":[
+   *           ],
+   *           "components":[
+   *              {
+   *                 "name":"jenkins",
+   *                 "dependencies":[
+   *                 ],
+   *                 "artifact":{
+   *                    "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+   *                    "type":"DOCKER"
+   *                 },
+   *                 "launch_command":"",
+   *                 "resource":{
+   *                    "uri":null,
+   *                    "profile":null,
+   *                    "cpus":1,
+   *                    "memory":"2048"
+   *                 },
+   *                 "number_of_containers":1,
+   *                 "run_privileged_container":false,
+   *                 "configuration":{
+   *                    "properties":{
+   *                    },
+   *                    "env":{
+   *                    },
+   *                    "files":[
+   *                    ]
+   *                 },
+   *                 "quicklinks":[
+   *                 ],
+   *                 "containers":[
+   *                 ]
+   *              }
+   *           ],
+   *           "configuration":{
+   *              "properties":{
+   *              },
+   *              "env":{
+   *              },
+   *              "files":[
+   *              ]
+   *           },
+   *           "quicklinks":{
+   *              "Jenkins UI":"http://jenkins.howita_man.yarn.${DOMAIN}:8080/"
+   *           }
+   *        }
+   *     }
+   * @param id - Application ID
+   * @return application entry-
+   */
+  @Path("config/{id}")
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public AppEntry getDetails(@PathParam("id") String id) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    return sc.findAppEntry(id);
+  }
+
+  /**
+   * Check application status.
+   *
+   * @apiGroup AppDetailController
+   * @apiName getStatus
+   * @api {get} /app_details/status/{id}  Check status of application instance.
+   * @apiParam {String} id Application ID to check.
+   * @apiSuccessExample {json} Success-Response:
+   *     HTTP/1.1 200 OK
+   *     {
+   *       "id":"howita_man",
+   *        "name":"howita_man",
+   *        "app":"Jenkins-ci.org/Jenkins",
+   *        "yarnfile":{
+   *           "name":"howita_man",
+   *           "lifetime":3099,
+   *           "containers":[
+   *           ],
+   *           "id":"application_1503694240849_0043",
+   *           "components":[
+   *              {
+   *                 "name":"jenkins",
+   *                 "dependencies":[
+   *                 ],
+   *                 "artifact":{
+   *                    "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+   *                    "type":"DOCKER"
+   *                 },
+   *                 "launch_command":"",
+   *                 "resource":{
+   *                    "uri":null,
+   *                    "profile":null,
+   *                    "cpus":1,
+   *                    "memory":"2048"
+   *                 },
+   *                 "number_of_containers":1,
+   *                 "run_privileged_container":false,
+   *                 "configuration":{
+   *                    "properties":{
+   *                    },
+   *                    "env":{
+   *                    },
+   *                    "files":[
+   *                    ]
+   *                 },
+   *                 "quicklinks":[
+   *                 ],
+   *                 "containers":[
+   *                    {
+   *                       "id":"container_1503694240849_0043_01_000002",
+   *                       "launch_time":1504630535403,
+   *                       "bare_host":"eyang-4.openstacklocal",
+   *                       "state":"READY",
+   *                       "component_name":"jenkins-0"
+   *                    }
+   *                 ]
+   *              }
+   *           ],
+   *           "configuration":{
+   *              "properties":{
+   *              },
+   *              "env":{
+   *              },
+   *              "files":[
+   *              ]
+   *           },
+   *           "quicklinks":{
+   *              "Jenkins UI":"http://jenkins.howita_man.yarn.${DOMAIN}:8080/"
+   *           }
+   *        }
+   *     }
+   * @apiSuccess {Object} text Give status
+   * @param id - Application ID
+   * @return application entry
+   */
+  @Path("status/{id}")
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public AppEntry getStatus(@PathParam("id") String id) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    AppEntry appEntry = sc.findAppEntry(id);
+    YarnClient yc = new YarnClient();
+    yc.getStatus(appEntry);
+    return appEntry;
+  }
+
+  /**
+   * Stop an application.
+   *
+   * @apiGroup AppDetailController
+   * @apiName stopApp
+   * @api {post} /app_details/stop/{id}  Stop one instance of application.
+   * @apiParam {String} id Application ID to stop.
+   * @apiSuccess {String} text Give deployment status
+   * @apiError BadRequest Requested application does not stop.
+   * @param id - Application ID
+   * @return Web response code
+   */
+  @Path("stop/{id}")
+  @POST
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response stopApp(@PathParam("id") String id) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    AppEntry app = sc.findAppEntry(id);
+    Service yarnApp = app.getYarnfile();
+    yarnApp.setState(ServiceState.STOPPED);
+    try {
+      YarnClient yc = new YarnClient();
+      yc.stopApp(yarnApp);
+    } catch (JsonProcessingException e) {
+      return Response.status(Status.BAD_REQUEST).build();
+    }
+    return Response.ok().build();
+  }
+
+  /**
+   * Restart an application.
+   *
+   * @apiGroup AppDetailController
+   * @apiName restartApp
+   * @api {post} /app_details/restart/{id}  Restart one instance of application.
+   * @apiParam {String} id Application ID to restart.
+   * @apiSuccess {String} text Give deployment status
+   * @apiError BadRequest Requested application does not restart.
+   * @param id - Application ID
+   * @return Web response code
+   */
+  @Path("restart/{id}")
+  @POST
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response restartApp(@PathParam("id") String id) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    AppEntry app = sc.findAppEntry(id);
+    Service yarnApp = app.getYarnfile();
+    yarnApp.setState(ServiceState.STARTED);
+    try {
+      YarnClient yc = new YarnClient();
+      yc.restartApp(yarnApp);
+    } catch (JsonProcessingException e) {
+      return Response.status(Status.BAD_REQUEST).build();
+    }
+    return Response.ok().build();
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java
new file mode 100644
index 00000000000..8c809ab8a2f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+import org.apache.hadoop.yarn.appcatalog.application.YarnClient;
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.solr.client.solrj.SolrServerException;
+
+/**
+ * Application deployment module.
+ */
+@Path("/app_list")
+@Produces({ MediaType.APPLICATION_JSON })
+public class AppListController {
+
+  public AppListController() {
+  }
+
+  /**
+   * Get Application List.
+   *
+   * @apiGroup AppListController
+   * @apiName get
+   * @api {get} /app_list  Get list of deployed applications.
+   * @apiSuccess {Object[]}  List<AppEntry> List of deployed Applications.
+   * @apiSuccessExample {json} Success-Response:
+   *     HTTP/1.1 200 OK
+   *     [
+   *        {
+   *           "id":"howita-man",
+   *           "name":"howita-man",
+   *           "app":"Jenkins-ci.org/Jenkins",
+   *           "yarnfile":{
+   *              "name":"howita_man",
+   *              "lifetime":3600,
+   *              "containers":[
+   *              ],
+   *              "components":[
+   *                 {
+   *                    "name":"jenkins",
+   *                    "dependencies":[
+   *                    ],
+   *                    "artifact":{
+   *                       "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+   *                       "type":"DOCKER"
+   *                    },
+   *                    "launch_command":"",
+   *                    "resource":{
+   *                       "uri":null,
+   *                       "profile":null,
+   *                       "cpus":1,
+   *                       "memory":"2048"
+   *                    },
+   *                    "number_of_containers":1,
+   *                    "run_privileged_container":false,
+   *                    "configuration":{
+   *                       "properties":{
+   *                       },
+   *                       "env":{
+   *                       },
+   *                       "files":[
+   *                       ]
+   *                    },
+   *                    "quicklinks":[
+   *                    ],
+   *                    "containers":[
+   *                    ]
+   *                 }
+   *              ],
+   *              "configuration":{
+   *                 "properties":{
+   *                 },
+   *                 "env":{
+   *                 },
+   *                 "files":[
+   *                 ]
+   *              },
+   *              "quicklinks":{
+   *                 "Jenkins UI":"http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+   *              }
+   *           }
+   *        },
+   *        {
+   *        ...
+   *        }
+   *     ]
+   * @return - Active application deployed by current user.
+   */
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public List<AppEntry> getList() {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    return sc.listAppEntries();
+  }
+
+  /**
+   * Delete an application.
+   *
+   * @apiGroup AppListController
+   * @apiName delete
+   * @api {delete} /app_list  Delete one instance of application.
+   * @apiParam {String} id Application name to delete.
+   * @apiSuccess {String} text Delete request accepted
+   * @param id - application ID
+   * @param name - application name
+   * @return Web response
+   */
+  @DELETE
+  @Path("{id}/{name}")
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response delete(@PathParam("id") String id,
+      @PathParam("name") String name) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    sc.deleteApp(id);
+    YarnClient yc = new YarnClient();
+    yc.deleteApp(name);
+    return Response.status(Status.ACCEPTED).build();
+  }
+
+  /**
+   * Deploy an application.
+   *
+   * @apiGroup AppListController
+   * @apiName deploy
+   * @api {post} /app_list/{id}  Deploy one instance of application.
+   * @apiParam {String} id Application ID to deploy.
+   * @apiSuccess {String} text Give deployment status
+   * @apiError BadRequest Unable to deploy requested application.
+   * @param id - application ID
+   * @return Web response
+   */
+  @POST
+  @Path("{id}")
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response deploy(@PathParam("id") String id, Service service) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    try {
+      sc.deployApp(id, service);
+    } catch (SolrServerException | IOException e) {
+      return Response.status(Status.BAD_REQUEST).entity(e.toString()).build();
+    }
+    YarnClient yc = new YarnClient();
+    yc.createApp(service);
+    String output = "{\"status\":\"Application deployed.\",\"id\":\"" +
+        service.getName() + "\"}";
+    return Response.status(Status.ACCEPTED).entity(output).build();
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java
new file mode 100644
index 00000000000..5abb548b5dc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+import org.apache.hadoop.yarn.appcatalog.model.Application;
+
+/**
+ * Application catalog REST API for searching and recommending
+ * applications.
+ *
+ */
+@Path("/app_store")
+public class AppStoreController {
+
+  public AppStoreController() {
+  }
+
+  /**
+   * Display the most frequently used applications on YARN AppCatalog home page.
+   *
+   * @apiGroup AppStoreController
+   * @apiName get
+   * @api {get} /app_store/recommended  Display recommended applications.
+   * @apiSuccess {Object} AppEntry Application configuration.
+   * @apiSuccessExample {json} Success-Response:
+   *     HTTP/1.1 200 OK
+   *     [
+   *        {
+   *           "id":"96b7833a-e3",
+   *           "org":"Hortonworks",
+   *           "name":"LAMP",
+   *           "desc":"Linux Apache MySQL PHP web application",
+   *           "icon":"/css/img/feather.png",
+   *           "like":0,
+   *           "download":0,
+   *           "app":null
+   *        },
+   *        {
+   *        ...
+   *        }
+   *     ]
+   * @return - List of YARN applications
+   */
+  @GET
+  @Path("recommended")
+  @Produces(MediaType.APPLICATION_JSON)
+  public List<AppStoreEntry> get() {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    return sc.getRecommendedApps();
+  }
+
+  /**
+   * Search for yarn applications from solr.
+   *
+   * @apiGroup AppStoreController
+   * @apiName search
+   * @api {get} /app_store/search  Find application from appstore.
+   * @apiParam {String} q Keyword to search.
+   * @apiSuccess {Object} AppStoreEntry List of matched applications.
+   * @apiSuccessExample {json} Success-Response:
+   *     HTTP/1.1 200 OK
+   *     [
+   *        {
+   *           "id":"96b7833a-e3",
+   *           "org":"Hortonworks",
+   *           "name":"LAMP",
+   *           "desc":"Linux Apache MySQL PHP web application",
+   *           "icon":"/css/img/feather.png",
+   *           "like":0,
+   *           "download":0,
+   *           "app":null
+   *        },
+   *        {
+   *        ...
+   *        }
+   *     ]
+   * @param keyword - search for keyword
+   * @return - List of YARN applications matching keyword search.
+   */
+  @GET
+  @Path("search")
+  @Produces(MediaType.APPLICATION_JSON)
+  public List<AppStoreEntry> search(@QueryParam("q") String keyword) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    return sc.search(keyword);
+  }
+
+  /**
+   * Find yarn application from solr.
+   *
+   * @param id Application ID
+   * @return AppEntry
+   */
+  @GET
+  @Path("get/{id}")
+  @Produces(MediaType.APPLICATION_JSON)
+  public AppStoreEntry get(@PathParam("id") String id) {
+    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+    return sc.findAppStoreEntry(id);
+  }
+
+  /**
+   * Register an application.
+   *
+   * @apiGroup AppStoreController
+   * @apiName register
+   * @api {post} /app_store/register  Register an application in appstore.
+   * @apiParam {Object} app Application definition.
+   * @apiParamExample {json} Request-Example:
+   *     {
+   *       "name": "Jenkins",
+   *       "organization": "Jenkins-ci.org",
+   *       "description": "The leading open source automation server",
+   *       "icon": "/css/img/jenkins.png",
+   *       "lifetime": "3600",
+   *       "components": [
+   *         {
+   *           "name": "jenkins",
+   *           "number_of_containers": 1,
+   *           "artifact": {
+   *             "id": "eyang-1.openstacklocal:5000/jenkins:latest",
+   *             "type": "DOCKER"
+   *           },
+   *           "launch_command": "",
+   *           "resource": {
+   *             "cpus": 1,
+   *             "memory": "2048"
+   *           },
+   *           "configuration": {
+   *             "env": {
+   *             },
+   *             "files": [
+   *             ]
+   *           }
+   *         }
+   *       ],
+   *       "quicklinks": {
+   *         "Jenkins UI": "http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+   *       }
+   *     }
+   * @apiSuccess {String} Response Application register result.
+   * @apiError BadRequest Error in process application registration.
+   * @param app - Yarnfile in JSON form
+   * @return Web response
+   */
+  @POST
+  @Path("register")
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response register(Application app) {
+    try {
+      if (app.getName()==null) {
+        throw new IOException("Application name can not be empty.");
+      }
+      if (app.getOrganization()==null) {
+        throw new IOException("Application organization can not be empty.");
+      }
+      if (app.getDescription()==null) {
+        throw new IOException("Application description can not be empty.");
+      }
+      AppCatalogSolrClient sc = new AppCatalogSolrClient();
+      sc.register(app);
+    } catch (IOException e) {
+      return Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
+    }
+    return Response.status(Status.ACCEPTED).build();
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java
new file mode 100644
index 00000000000..f2507b15977
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+/**
+ * Application Catalog controllers.
+ */
+package org.apache.hadoop.yarn.appcatalog.controller;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java
new file mode 100644
index 00000000000..42012cfb816
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Data model for user defined application configuration.
+ */
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+public class AppDetails {
+  private String image;
+  private String version;
+  private String[] ports;
+  private String[] volumes;
+  private String[] env;
+
+  public String getImage() {
+    return image;
+  }
+
+  public void setImage(String image) {
+    this.image = image;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  public String[] getPorts() {
+    return ports;
+  }
+
+  public void setPorts(String[] ports2) {
+    this.ports = ports2;
+  }
+
+  public String[] getVolumes() {
+    return volumes;
+  }
+
+  public void setVolumes(String[] volumes) {
+    this.volumes = volumes;
+  }
+
+  public String[] getEnv() {
+    return env;
+  }
+
+  public void setEnv(String[] env) {
+    this.env = env;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java
new file mode 100644
index 00000000000..acba4d9a8ba
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.hadoop.yarn.service.api.records.Service;
+
+/**
+ * Data model for deployed application.
+ *
+ */
+@XmlType(namespace="http://hadoop.apache.org", name="AppEntry")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+public class AppEntry {
+  private String id;
+  private String name;
+  private String app;
+  private Service yarnfile;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getApp() {
+    return app;
+  }
+
+  public void setApp(String app) {
+    this.app = app;
+  }
+
+  public Service getYarnfile() {
+    return yarnfile;
+  }
+
+  public void setYarnfile(Service yarnfile) {
+    this.yarnfile = yarnfile;
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java
new file mode 100644
index 00000000000..f2452976008
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.hadoop.yarn.service.api.records.Service;
+
+/**
+ * Data model of application template stored in application catalog.
+ */
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+public class AppStoreEntry {
+  private String id;
+  private String org;
+  private String name;
+  private String desc;
+  private String icon = "/css/img/feather.png";
+  private long like;
+  private long download;
+  private Service app;
+
+  public String getOrg() {
+    return org;
+  }
+
+  public void setOrg(String org) {
+    this.org = org;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDesc() {
+    return desc;
+  }
+
+  public void setDesc(String desc) {
+    this.desc = desc;
+  }
+
+  public long getLike() {
+    return like;
+  }
+
+  public void setLike(long like) {
+    this.like = like;
+  }
+
+  public long getDownload() {
+    return download;
+  }
+
+  public void setDownload(long download) {
+    this.download = download;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public Service getApp() {
+    return app;
+  }
+
+  public void setApp(Service app) {
+    this.app = app;
+  }
+
+  public String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(String icon) {
+    this.icon = icon;
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java
new file mode 100644
index 00000000000..dbc31b147e3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.model;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.hadoop.yarn.service.api.records.Service;
+
+/**
+ * Data model of display recommended applications and descriptions.
+ */
+@XmlRootElement
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonPropertyOrder({ "organization", "name", "description", "icon" })
+public class Application extends Service {
+  private static final long serialVersionUID = -1776203219305414248L;
+
+  private String organization;
+  private String description;
+  private String icon;
+
+  @JsonProperty("organization")
+  public String getOrganization() {
+    return organization;
+  }
+  public void setOrganization(String organization) {
+    this.organization = organization;
+  }
+
+  @JsonProperty("description")
+  public String getDescription() {
+    return description;
+  }
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  @JsonProperty("icon")
+  public String getIcon() {
+    return icon;
+  }
+  public void setIcon(String icon) {
+    this.icon = icon;
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java
new file mode 100644
index 00000000000..9a20b993848
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+/**
+ * Application Catalog Data Models.
+ */
+package org.apache.hadoop.yarn.appcatalog.model;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java
new file mode 100644
index 00000000000..4346d1e6242
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java
@@ -0,0 +1,422 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.appcatalog.utils;
+
+import java.util.Arrays;
+import java.util.Random;
+
+/**
+ * Random word generator utility.
+ */
+public final class RandomWord {
+
+  private RandomWord() {
+  }
+
+  public static String getNewWord(int wordLength) throws WordLengthException {
+    if (wordLength < 3 || wordLength > 15) {
+      throw new WordLengthException(
+          "Word length error, words must be between 3 and 15 characters long.");
+    }
+    String theNewWord = "e";
+    while (theNewWord.equals("e")) {
+      try {
+        theNewWord = generateRandomWord(wordLength);
+      } catch (Exception e) {
+      }
+    }
+    return theNewWord;
+  }
+
+  private static String generateRandomWord(int wordLength) {
+    String randomWord;
+    // -----------------------------------------------------------------------
+    // Bigram source and general concept based on
+    // https://github.com/scrollback/scrollback & described in
+    // https://www.hackerearth.com/notes/random-pronouncable-text-generator/
+    String[] startBiGram = {"TH", "OF", "AN", "IN", "TO", "CO", "BE", "HE",
+        "RE", "HA", "WA", "FO", "WH", "MA", "WI", "ON", "HI", "PR", "ST", "NO",
+        "IS", "IT", "SE", "WE", "AS", "CA", "DE", "SO", "MO", "SH", "DI", "AL",
+        "AR", "LI", "WO", "FR", "PA", "ME", "AT", "SU", "BU", "SA", "FI", "NE",
+        "CH", "PO", "HO", "DO", "OR", "UN", "LO", "EX", "BY", "FA", "LA", "LE",
+        "PE", "MI", "SI", "YO", "TR", "BA", "GO", "BO", "GR", "TE", "EN", "OU",
+        "RA", "AC", "FE", "PL", "CL", "SP", "BR", "EV", "TA", "DA", "AB", "TI",
+        "RO", "MU", "EA", "NA", "SC", "AD", "GE", "YE", "AF", "AG", "UP", "AP",
+        "DR", "US", "PU", "CE", "IF", "RI", "VI", "IM", "AM", "KN", "OP", "CR",
+        "OT", "JU", "QU", "TW", "GA", "VA", "VE", "PI", "GI", "BI", "FL", "BL",
+        "EL", "JO", "FU", "HU", "CU", "RU", "OV", "MY", "OB", "KE", "EF", "PH",
+        "CI", "KI", "NI", "SL", "EM", "SM", "VO", "MR", "WR", "ES", "DU", "TU",
+        "AU", "NU", "GU", "OW", "SY", "JA", "OC", "EC", "ED", "ID", "JE", "AI",
+        "EI", "SK", "OL", "GL", "EQ", "LU", "AV", "SW", "AW", "EY", "TY"};
+    String[] lookupBiGram = {"TH", "AN", "IN", "IO", "EN", "TI", "FO", "HE",
+        "HA", "HI", "TE", "AT", "ER", "AL", "WA", "VE", "CO", "RE", "IT", "WI",
+        "ME", "NC", "ON", "PR", "AR", "ES", "EV", "ST", "EA", "IV", "EC", "NO",
+        "OU", "PE", "IL", "IS", "MA", "AV", "OM", "IC", "GH", "DE", "AI", "CT",
+        "IG", "ID", " OR", "OV", "UL", "YO", "BU", "RA", "FR", "RO", "WH", "OT",
+        "BL", "NT", "UN", "TR", "HO", "AC", "TU", "WE", "CA", "SH", "UR", "IE",
+        "PA", "TO", "EE", "LI", "RI", "UG", "AM", "ND", "US", "LL", "AS", "TA",
+        "LE", "MO", "WO", "MI", "AB", "EL", "IA", "NA", "SS", "AG", "TT", "NE",
+        "PL", " LA", "OS", "CE", "DI", "BE", "AP", "SI", "NI", "OW", "SO", "AK",
+        "CH", "EM", "IM", "SE", "NS", "PO", "EI", "EX", "KI", "UC", "AD", "GR",
+        "IR", "NG", "OP", "SP", "OL", "DA", "NL", "TL", "LO", "BO", "RS", "FE",
+        "FI", "SU", "GE", "MP", "UA", "OO", "RT", "SA", "CR", "FF", "IK", "MB",
+        " KE", "FA", "CI", "EQ", "AF", "ET", "AY", "MU", "UE", "HR", "TW", "GI",
+        "OI", "VI", "CU", "FU", "ED", "QU", "UT", "RC", "OF", "CL", "FT", "IZ",
+        "PP", "RG", "DU", "RM", "YE", "RL", "DO", "AU", "EP", "BA", "JU", "RD",
+        "RU", "OG", "BR", "EF", "KN", "LS", "GA", "PI", "YI", "BI", "IB", "UB",
+        "VA", "OC", "IF", "RN", "RR", "SC", "TC", "CK", "DG", "DR", "MM", "NN",
+        "OD", "RV", "UD", "XP", "JE", "UM", "EG", "DL", "PH", "SL", "GO", "CC",
+        "LU", "OA", "PU", "UI", "YS", "ZA", "HU", "MR", "OE", "SY", "EO", "TY",
+        "UP", "FL", "LM", "NF", "RP", "OH", "NU", "XA", "OB", "VO", "DM", "GN",
+        " LD", "PT", "SK", "WR", "JO", "LT", "YT", "UF", "BJ", "DD", "EY", "GG",
+        "GL", "GU", "HT", "LV", "MS", "NM", "NV", "OK", "PM", "RK", "SW", "TM",
+        "XC", "ZE", "AW", "SM"};
+    String[][][] nextCharLookup = {
+        {{"E", "A", "I", "O", "R"}, {"E", "O"}},
+        {{"D", "T", "Y", "C", "S", "G", "N", "I", "O", "E", "A", "K"},
+            {"D", "T", "Y", "S", "G", "O", "E", "A", "K"}},
+        {{"G", "T", "E", "D", "S", "C", "A", "I", "K", "V", "U", "N", "F"},
+            {"G", "T", "E", "D", "S", "A", "K"}},
+        {{"N", "U", "R"}, {"N", "U", "R"}},
+        {{"T", "C", "D", "S", "E", "I", "G", "O", "N", "A"},
+            {"T", "D", "S", "E", "G", "O", "A"}},
+        {{"O", "N", "C", "V", "M", "L", "E", "T", "S", "A", "R", "F"},
+            {"N", "C", "M", "L", "E", "T", "S", "A", "R", "F"}},
+        {{"R", "U", "O", "L"}, {"R", "U", "O", "L"}},
+        {{"R", "N", "Y", "S", "M", "I", "A", "L", "D", "T"},
+            {"R", "N", "Y", "S", "M", "A", "L", "D", "T"}},
+        {{"T", "D", "V", "N", "S", "R", "P", "L"},
+            {"T", "D", "N", "S", "R", "L"}},
+        {{"S", "N", "C", "M", "L", "P", "G", "T", "R", "E"},
+            {"S", "N", "C", "M", "L", "P", "G", "T", "R", "E"}},
+        {{"R", "D", "N", "S", "M", "L", "E", "C", "A"},
+            {"R", "D", "N", "S", "M", "L", "E", "A"}},
+        {{"I", "E", "T", "H", "U", "O", "C"}, {"E", "H", "O"}},
+        {{"E", "S", "I", "A", "N", "Y", "T", "V", "M", "R", "O", "L", "G",
+             "F", "C"}, {"E", "S", "A", "N", "Y", "T", "M"}},
+        {{"L", "S", "I", "T", "E", "U", "O", "M", "K", "F", "A"},
+            {"L", "S", "T", "E", "F"}},
+        {{"S", "Y", "R", "T", "N", "L"}, {"S", "Y", "R", "T", "N", "L"}},
+        {{"R", "N", "L", "S", "D"}, {"R", "N", "L", "S", "D"}},
+        {{"N", "M", "U", "R", "L", "V", "S", "O"},
+            {"N", "M", "U", "R", "L", "O"}},
+        {{"S", "A", "D", "N", "E", "C", "L", "T", "P", "M", "V", "G", "F",
+             "Q"}, {"S", "A", "D", "N", "E", "L", "T", "P", "M"}},
+        {{"H", "I", "Y", "E", "S", "T", "A", "U"},
+            {"H", "Y", "E", "S", "A"}},
+        {{"T", "L", "N", "S"}, {"T", "L", "N", "S"}},
+        {{"N", "R", "D", "T", "S", "M", "A"},
+            {"N", "R", "D", "T", "S", "M", "A"}},
+        {{"E", "I", "H", "T", "R", "O", "L"}, {"E", "H", "T"}},
+        {{"S", "E", "T", "G", "A", "D", "L", "C", "V", "O", "I", "F"},
+            {"S", "E", "T", "G", "A", "D", "O"}},
+        {{"O", "E", "I", "A"}, {"E", "A"}},
+        {{"E", "T", "D", "Y", "S", "I", "R", "L", "M", "K", "G", "A", "O",
+             "N", "C"}, {"E", "T", "D", "Y", "S", "M", "K", "A", "N"}},
+        {{"S", "T", "E", "I", "P", "U", "C"}, {"S", "T", "E"}},
+        {{"E", "I"}, {"E"}},
+        {{"A", "R", "I", "E", "O", "U", "S"}, {"A", "E", "O", "S"}},
+        {{"R", "S", "T", "D", "L", "C", "N", "V", "M", "K"},
+            {"R", "S", "T", "D", "L", "N", "M"}},
+        {{"E", "I", "A"}, {"E"}},
+        {{"T", "O", "I", "E", "A", "U", "R", "H"}, {"T", "E", "H"}},
+        {{"T", "W", "R", "U", "N", "M"}, {"T", "W", "R", "U", "N", "M"}},
+        {{"T", "L", "R", "N", "S", "G", "P", "B"},
+            {"T", "L", "R", "N", "S", "P"}},
+        {{"R", "N", "C", "A", "D", "T", "O"}, {"R", "N", "A", "D", "T"}},
+        {{"L", "E", "I", "Y", "D", "A"}, {"L", "E", "Y", "D"}},
+        {{"T", "H", "S", "I", "E", "C", "M"}, {"T", "H", "S", "E", "M"}},
+        {{"N", "T", "L", "K", "D", "S", "I", "G"},
+            {"N", "T", "L", "D", "S"}},
+        {{"E", "I", "A"}, {"E"}},
+        {{"E", "P", "M", "I", "A"}, {"E"}},
+        {{"A", "H", "E", "I", "T", "K", "U", "S"},
+            {"H", "E", "T", "K", "S"}},
+        {{"T"}, {"T"}},
+        {{"R", "N", "S", "D", "A", "V", "P", "T", "M", "L", "F"},
+            {"R", "N", "S", "D", "A", "P", "T", "M", "L"}},
+        {{"N", "D", "R", "L", "T"}, {"N", "D", "R", "L", "T"}},
+        {{"I", "E", "U", "S", "O"}, {"E", "S", "O"}},
+        {{"H", "N", "I"}, {"H", "N"}}, {{"E"}, {"E"}},
+        {{"E", "T", "M", "D", "S", "K", "I", "Y", "L", "G", "A", "R", "N",
+             "C"}, {"E", "T", "M", "D", "S", "K", "Y", "A", "N"}},
+        {{"E", "I"}, {"E"}},
+        {{"D", "T", "A", "L"}, {"D", "T", "L"}}, {{"U"}, {"U"}},
+        {{"T", "S", "R", "I"}, {"T", "S", "R"}},
+        {{"T", "N", "L", "C", "I", "M", "D", "S", "R", "P", "G", "B"},
+            {"T", "N", "L", "M", "D", "S", "R"}},
+        {{"O", "E", "A"}, {"E", "A"}},
+        {{"M", "U", "V", "P", "N", "W", "S", "O", "L", "D", "C", "B", "A",
+             "T", "G"}, {"M", "U", "P", "N", "W", "O", "L", "D", "T"}},
+        {{"I", "E", "O", "A"}, {"E", "O"}},
+        {{"H", "E", "T", "I"}, {"H", "E"}},
+        {{"E", "I", "Y", "O", "A"}, {"E", "Y"}},
+        {{"E", "I", "S", "R", "O", "A", "L", "Y", "U", "H"},
+            {"E", "S", "O", "A", "Y", "H"}},
+        {{"D", "T", "I", "C", "G"}, {"D", "T", "G"}},
+        {{"A", "I", "O", "E", "U", "Y"}, {"A", "E", "Y"}},
+        {{"U", "W", "S", "R", "L", "O", "M", "T", "P", "N", "D"},
+            {"U", "W", "R", "L", "O", "M", "T", "P", "N", "D"}},
+        {{"T", "E", "K", "H", "C", "R", "I"}, {"T", "E", "K", "H"}},
+        {{"R", "D", "A", "T"}, {"R", "T"}},
+        {{"R", "L", "E", "V", "S", "N", "A"},
+            {"R", "L", "E", "S", "N", "A"}},
+        {{"L", "N", "T", "R", "U", "S", "M", "P"},
+            {"L", "N", "T", "R", "S", "M"}},
+        {{"E", "O", "I", "A"}, {"E", "O"}},
+        {{"E", "N", "T", "S", "I", "A", "Y", "R", "P", "C"},
+            {"E", "N", "T", "S", "A", "Y"}},
+        {{"S", "N", "D", "T", "W", "V", "R", "L", "F"},
+            {"S", "N", "D", "T", "W", "R", "L"}},
+        {{"R", "T", "S", "N", "L", "I", "C"}, {"R", "T", "S", "N", "L"}},
+        {{"R", "O", "N", "W", "P", "M", "L"},
+            {"R", "O", "N", "W", "P", "M", "L"}},
+        {{"N", "D", "T", "M", "S", "R", "P", "L", "K"},
+            {"N", "D", "T", "M", "S", "R", "P", "L", "K"}},
+        {{"N", "T", "S", "C", "K", "G", "E", "F", "Z", "V", "O", "M", "A"},
+            {"N", "T", "S", "C", "G", "E", "F", "M", "A"}},
+        {{"N", "E", "C", "T", "S", "G", "A", "V", "O", "P", "M", "L", "D",
+             "B"}, {"N", "E", "C", "T", "S", "G", "A", "P", "M", "L", "D"}},
+        {{"H", "G"}, {"H"}}, {{"E", "P", "I", "O", "A"}, {"E"}},
+        {{"E", "I", "S", "A", "U", "O"}, {"E", "S", "O"}},
+        {{"E", "T", "I", "S", "L", "H"}, {"E", "T", "S", "H"}},
+        {{"Y", "E", "O", "I", "S", "A"}, {"Y", "E", "S"}},
+        {{"T", "S", "E", "I", "U", "O", "K", "H"},
+            {"T", "S", "E", "O", "H"}},
+        {{"T", "N", "L", "I", "R", "K", "B", "G", "C"},
+            {"T", "N", "L", "R"}},
+        {{"S", "D", "A", "T", "C", "R", "N", "M", "G", "V", "F"},
+            {"S", "D", "A", "T", "R", "N", "M"}},
+        {{"R", "S", "V", "T", "U", "D"}, {"R", "T", "U", "D"}},
+        {{"R", "U"}, {"R", "U"}},
+        {{"N", "L", "S", "T", "C", "G"}, {"N", "L", "S", "T", "C", "G"}},
+        {{"L", "O", "I"}, {}},
+        {{"L", "Y", "I", "E", "F", "O", "A", "T", "S", "P", "D"},
+            {"L", "Y", "E", "F", "T", "S", "D"}},
+        {{"L", "N", "T"}, {"L", "N", "T"}},
+        {{"L", "T", "R", "N", "M"}, {"L", "T", "R", "N", "M"}},
+        {{"I", "E", "U", "O", "A"}, {"E", "O"}},
+        {{"E", "A", "O"}, {"E", "O"}}, {{"E", "L", "I"}, {"E"}},
+        {{"D", "S", "W", "R", "E", "Y", "V", "T", "L", "C", "A"},
+            {"D", "S", "W", "R", "E", "Y", "T", "L", "A"}},
+        {{"A", "E", "I", "Y", "O"}, {"E", "Y"}},
+        {{"T", "N", "R", "S", "C", "Y", "W", "I", "B"},
+            {"T", "N", "R", "S", "Y", "W"}},
+        {{"T", "E", "S", "I"}, {"T", "E", "S"}},
+        {{"S", "N", "R", "D", "P", "L", "I"},
+            {"S", "N", "R", "D", "P", "L"}},
+        {{"S", "N", "T", "D", "F", "E", "C", "A", "V", "R"},
+            {"S", "N", "T", "D", "F", "E", "C", "A", "R"}},
+        {{"R", "E", "C", "T", "L", "F", "S", "I", "G", "D", "A"},
+            {"R", "E", "T", "L", "S", "D", "A"}},
+        {{"P", "E", "A"}, {"E"}},
+        {{"O", "N", "D", "T", "S", "G", "C", "B", "V", "M", "A"},
+            {"N", "D", "T", "S", "G", "C", "M", "A"}},
+        {{"N", "T", "S", "C", "Z", "O", "G", "F"},
+            {"N", "T", "S", "C", "G", "F"}},
+        {{"N", "E", "S", "I", "A"}, {"N", "E", "S"}},
+        {{"N", "M", "U", "L", "C", "R"}, {"N", "M", "U", "L", "R"}},
+        {{"E", "I"}, {"E"}},
+        {{"E", "A", "I", "O", "U", "R"}, {"E", "O"}},
+        {{"E", "S", "P", "O", "B", "A", "I"}, {"E", "S"}},
+        {{"E", "P", "I", "A", "S", "M"}, {"E", "S"}},
+        {{"D", "N", "L", "S", "R", "E", "C", "T", "V", "A"},
+            {"D", "N", "L", "S", "R", "E", "T", "A"}},
+        {{"T", "I", "E"}, {"T", "E"}},
+        {{"S", "R", "N", "L", "W", "T", "I"}, {"R", "N", "L", "W", "T"}},
+        {{"R", "N", "G", "T"}, {"R", "N", "G", "T"}},
+        {{"P", "T", "I", "C", "A"}, {"T"}}, {{"N"}, {"N"}},
+        {{"H", "T", "K", "E"}, {"H", "T", "K", "E"}},
+        {{"E", "I", "Y", "V", "M", "D"}, {"E", "Y"}},
+        {{"E", "A", "O"}, {"E", "A"}},
+        {{"E", "S", "T", "L", "I"}, {"E", "S", "T"}},
+        {{"E", "S", "L", "T", "R", "I"}, {"E", "S"}},
+        {{"E", "P", "L"}, {"E"}}, {{"E", "O", "I", "A"}, {"E"}},
+        {{"D", "L", "I", "O", "E", "U"}, {"D", "L", "E"}},
+        {{"Y", "T", "R", "N"}, {"Y", "T", "R", "N"}},
+        {{"Y"}, {"Y"}}, {{"Y", "E"}, {"Y", "E"}},
+        {{"W", "N", "O", "S", "C", "V", "U", "T", "R", "P", "G"},
+            {"W", "N", "O", "U", "T", "R", "P"}},
+        {{"U", "T", "R", "O", "D", "A"}, {"U", "T", "R", "O", "D"}},
+        {{"T", "E", "O", "I"}, {"T", "E", "O"}},
+        {{"R", "E", "W", "L", "C", "A"}, {"R", "E", "W", "L", "A"}},
+        {{"R", "N", "C", "E", "L", "G"}, {"R", "N", "C", "E", "L", "G"}},
+        {{"R", "C", "P", "B", "M", "L", "A"}, {"R", "P", "M", "L"}},
+        {{"N", "T", "S", "R", "D"}, {"N", "T", "S", "R", "D"}},
+        {{"L", "O", "A", "T", "R", "E"}, {"T", "E"}},
+        {{"L", "T", "R"}, {"L", "T", "R"}},
+        {{"K", "D", "L", "T", "R", "N", "M"},
+            {"K", "D", "L", "T", "R", "N", "M"}},
+        {{"I", "H", "A", "E", "Y", "U", "S"}, {"H", "A", "E", "Y", "S"}},
+        {{"I", "M", "Y", "N", "L"}, {"M", "Y", "N", "L"}},
+        {{"E", "I", "O", "A"}, {"E", "A"}}, {{"E", "I"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"D", "N", "T", "S", "R", "E"}, {"D", "N", "T", "S", "R", "E"}},
+        {{"C", "R", "M", "I"}, {"R", "M"}},
+        {{"A", "T", "E", "S", "P", "N"}, {"A", "T", "E", "S", "P", "N"}},
+        {{"U"}, {}}, {{"T", "F"}, {"T", "F"}},
+        {{"T", "I", "H", "E", "Y", "W", "S", "A"},
+            {"H", "E", "Y", "S", "A"}},
+        {{"S", "E"}, {"S"}},
+        {{"S", "N", "L", "C"}, {"S", "N", "L"}},
+        {{"S", "N"}, {"S", "N"}}, {{"O", "E", "I"}, {"E"}},
+        {{"O", "E"}, {"O", "E"}},
+        {{"N", "V", "O", "C"}, {"N", "C"}}, {{"N"}, {"N"}},
+        {{"N", "D", "S", "C", "T", "O", "L", "E"},
+            {"N", "D", "S", "C", "T", "L", "E"}},
+        {{"L", "R", "T", "S"}, {"L", "R", "T", "S"}},
+        {{"L", "R", "N"}, {"L", "R", "N"}},
+        {{"I", "U", "E"}, {"E"}}, {{"I", "E", "A"}, {"E"}},
+        {{"I", "H", "E"}, {"H", "E"}}, {{"H", "E"}, {"H", "E"}},
+        {{"F", "T"}, {"F", "T"}}, {{"E", "A", "U", "O"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E", "A"}, {"E"}},
+        {{"E", "O", "R", "L"}, {"E"}}, {{"E", "A"}, {"E"}},
+        {{"C", "S", "R", "A"}, {"S", "R"}},
+        {{"A", "S", "I", "E"}, {"S", "E"}},
+        {{"A", "S", "D"}, {"A", "S", "D"}},
+        {{"Y", "D"}, {"Y", "D"}},
+        {{"W", "N", "M", "E"}, {"W", "N", "M"}},
+        {{"T", "S"}, {"T", "S"}},
+        {{"T", "O", "E", "A"}, {"T", "E"}},
+        {{"S", "C", "R", "N", "L"}, {"S", "R", "N", "L"}},
+        {{"S"}, {"S"}}, {{"S", "E", "I"}, {"S", "E"}},
+        {{"S", "N", "C"}, {"S", "N"}}, {{"R", "I"}, {}},
+        {{"O", "I", "E", "A"}, {"E", "A"}},
+        {{"O", "F", "U", "T", "E"}, {"F", "T", "E"}},
+        {{"O", "E"}, {"O", "E"}}, {{"O"}, {"O"}},
+        {{"N", "I", "T", "R"}, {"N", "T", "R"}},
+        {{"N", "T", "R", "E", "C"}, {"N", "T", "R", "E", "C"}},
+        {{"N"}, {"N"}}, {{"L", "T", "N"}, {"L", "T", "N"}},
+        {{"L", "I", "E"}, {"E"}}, {{"L"}, {}},
+        {{"L", "T", "R", "N"}, {"L", "T", "R", "N"}},
+        {{"K", "I", "E", "C", "A"}, {"K", "E"}},
+        {{"I", "F", "E", "T"}, {"F", "E", "T"}},
+        {{"I", "E", "M", "A"}, {"E", "A"}},
+        {{"I", "E", "Y", "O"}, {"E", "Y"}},
+        {{"H", "R", "O", "I", "A"}, {"H"}}, {{"H"}, {"H"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"E", "O", "I", "A"}, {"E", "A"}},
+        {{"E", "U", "I"}, {"E"}}, {{"E", "O", "I"}, {"E", "O"}},
+        {{"E", "Y", "U"}, {"E", "Y"}}, {{"E", "I"}, {"E"}},
+        {{"E", "I"}, {"E"}}, {{"E"}, {"E"}}, {{"C"}, {}},
+        {{"B", "E"}, {"E"}}, {{"A", "R", "I", "E"}, {"E"}},
+        {{"Y", "E"}, {"Y", "E"}},
+        {{"Y", "O", "I", "E"}, {"Y", "O", "E"}},
+        {{"Y", "A"}, {"Y"}}, {{"V", "T", "O"}, {"T", "O"}},
+        {{"U", "O", "E"}, {"E"}},
+        {{"T", "S", "M", "E", "D"}, {"T", "S", "M", "E"}},
+        {{"T", "R", "D"}, {"T", "R", "D"}},
+        {{"T", "R", "L", "B"}, {"T", "R", "L"}},
+        {{"T", "R", "L"}, {"T", "R", "L"}}, {{"T"}, {"T"}},
+        {{"T"}, {"T"}},
+        {{"S", "R", "N", "M"}, {"S", "R", "N", "M"}},
+        {{"S"}, {"S"}}, {{"S"}, {"S"}}, {{"S"}, {"S"}},
+        {{"R", "P"}, {"R", "P"}}, {{"P"}, {}}, {{"P", "O"}, {}},
+        {{"O", "E"}, {"E"}}, {{"O"}, {}}, {{"O"}, {}},
+        {{"O"}, {}}, {{"N"}, {}}, {{"M"}, {"M"}},
+        {{"M"}, {"M"}}, {{"L"}, {}}, {{"L"}, {"L"}},
+        {{"I"}, {}}, {{"I"}, {}}, {{"I", "E"}, {"E"}},
+        {{"I"}, {}}, {{"I", "E"}, {"E"}}, {{"I"}, {}},
+        {{"H"}, {}}, {{"H", "E"}, {"H", "E"}}, {{"H"}, {"H"}},
+        {{"F"}, {"F"}}, {{"E"}, {}}, {{"E"}, {"E"}},
+        {{"E"}, {}}, {{"E"}, {"E"}}, {{"E", "A"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+        {{"D"}, {"D"}}, {{"A"}, {}}, {{"A"}, {}}};
+    // ------------------------------------------------------------------------
+    randomWord = startBiGram[indexGenerator(startBiGram.length)];
+    int flag = 0;
+    int count = 0;
+    String previousWord;
+    while (randomWord.length() != wordLength) {
+      previousWord = randomWord;
+      randomWord = addCharacter(startBiGram, wordLength, randomWord,
+          lookupBiGram, nextCharLookup, flag);
+      if (previousWord.equals(randomWord)) {
+        count++;
+      } else {
+        flag = 0;
+      }
+      if (count == 5) {
+        flag = 1;
+        count++;
+      } else if (count == 20) {
+        randomWord = startBiGram[indexGenerator(startBiGram.length)];
+        count = 0;
+      }
+    }
+    return randomWord;
+  }
+
+  private static String addCharacter(String[] startBiGram, int desiredLength,
+      String currentWord, String[] lookupBiGram, String[][][] nextCharLookup,
+      int flag) {
+    int mainIndex = getLookupIndex(currentWord, lookupBiGram);
+    int type = 0;
+    if (currentWord.length() == (desiredLength - 1)) {
+      type = 1;
+    }
+    while (mainIndex < 0 || mainIndex > 263
+        || nextCharLookup[mainIndex][type].length <= 0) {
+      if (currentWord.length() == 2) {
+        return startBiGram[indexGenerator(startBiGram.length)];
+      }
+      if (flag == 1) {
+        currentWord = backtrack(currentWord, 2);
+        flag = 0;
+      } else {
+        currentWord = backtrack(currentWord, 1);
+      }
+      mainIndex = getLookupIndex(currentWord, lookupBiGram);
+      if (type == 1) {
+        type = 0;
+      }
+    }
+    String updatedWord = currentWord
+        + getNextCharacter(type, mainIndex, nextCharLookup);
+    return updatedWord;
+  }
+
+  private static int indexGenerator(int arrayLength) {
+    int theIndex;
+    Random generator = new Random();
+    theIndex = generator.nextInt(arrayLength);
+    return theIndex;
+  }
+
+  private static String getNextCharacter(int type, int mainIndex,
+      String[][][] theCharacterVault) {
+    String nextChar;
+    int i = indexGenerator(theCharacterVault[mainIndex][type].length);
+    nextChar = theCharacterVault[mainIndex][type][i];
+    return nextChar;
+  }
+
+  private static String backtrack(String theWord, int numberChars) {
+    theWord = theWord.substring(0, theWord.length() - numberChars);
+    return theWord;
+  }
+
+  private static int getLookupIndex(String theWord, String[] lookupArray) {
+    String lookupCharacters = theWord.substring(theWord.length() - 2);
+    int lookupIndex = Arrays.asList(lookupArray).indexOf(lookupCharacters);
+    return lookupIndex;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java
new file mode 100644
index 00000000000..42a5f7fb47c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.appcatalog.utils;
+
+/**
+ * Word length exception class.
+ */
+public class WordLengthException extends Exception {
+  private static final long serialVersionUID = -217354336577036950L;
+
+  public WordLengthException(String message){
+    super(message);
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java
new file mode 100644
index 00000000000..bde7fc55e41
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+/**
+ * Application Catalog Utilities classes.
+ */
+package org.apache.hadoop.yarn.appcatalog.utils;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js
new file mode 100644
index 00000000000..0a7b6dbfff3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var app = angular.module('app', [
+   'ngRoute',
+   'filters',
+   'controllers'
+]);
+
+app.directive('jsonText', function() {
+  return {
+      restrict: 'A',
+      require: 'ngModel',
+      link: function(scope, element, attr, ngModel) {
+        function into(input) {
+          console.log(JSON.parse(input));
+          return JSON.parse(input);
+        }
+        function out(data) {
+          return JSON.stringify(data);
+        }
+        ngModel.$parsers.push(into);
+        ngModel.$formatters.push(out);
+      }
+  };
+});
+
+app.config(['$routeProvider',
+  function ($routeProvider) {
+    $routeProvider.when('/', {
+      templateUrl: 'partials/home.html',
+      controller: 'AppStoreController'
+    }).when('/app/:id', {
+      templateUrl: 'partials/details.html',
+      controller: 'AppDetailsController'
+    }).when('/new', {
+      templateUrl: 'partials/new.html',
+      controller: 'NewAppController'
+    }).when('/deploy/:id', {
+      templateUrl: 'partials/deploy.html',
+      controller: 'DeployAppController'
+    }).otherwise({
+      redirectTo: '/'
+    });
+}]);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js
new file mode 100644
index 00000000000..241f15db7ec
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js
@@ -0,0 +1,320 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var controllers = angular.module("controllers", []);
+
+controllers.controller("AppListController", [ '$scope', '$rootScope', '$http',
+    function($scope, $rootScope, $http) {
+      $scope.appList = [];
+
+      function successCallback(response) {
+        $scope.appList = response.data;
+        $rootScope.$emit("hideLoadScreen", {});
+      }
+
+      function errorCallback(response) {
+        $rootScope.$emit("hideLoadScreen", {});
+        console.log("Error in downloading application list");
+      }
+
+      $rootScope.$on("RefreshAppList", function() {
+        $scope.refreshList();
+      });
+
+      $scope.refreshList = function() {
+        $http({
+          method : 'GET',
+          url : '/v1/app_list'
+        }).then(successCallback, errorCallback);
+      }
+
+      $scope.deleteApp = function(id, name) {
+        $rootScope.$emit("showLoadScreen", {});
+        $http({
+          method: 'DELETE',
+          url: '/v1/app_list/' + id + '/' + name
+        }).then(function(response) {
+          $rootScope.$emit("RefreshAppList", {});
+          window.location = '/#';
+        }, function(response) {
+          console.log(response);
+        });
+      }
+      $http({
+        method : 'GET',
+        url : '/v1/app_list'
+      }).then(successCallback, errorCallback);
+    } ]);
+
+controllers.controller("AppStoreController", [ '$scope', '$rootScope', '$http',
+    function($scope, $rootScope, $http) {
+      $scope.canDeployApp = function() {
+        return false;
+      };
+      $scope.appStore = [];
+      $scope.searchText = null;
+
+      function successCallback(response) {
+        $scope.appStore = response.data;
+      }
+
+      function errorCallback(response) {
+        console.log("Error in downloading AppStore information.");
+      }
+
+      $scope.deployApp = function(id) {
+        window.location = '/#!/deploy/' + id;
+      }
+
+      $http({
+        method : 'GET',
+        url : '/v1/app_store/recommended'
+      }).then(successCallback, errorCallback);
+
+      $scope.change = function(text) {
+        var q = $scope.searchText;
+        $http({
+          method : 'GET',
+          url : '/v1/app_store/search?q=' + q
+        }).then(successCallback, errorCallback);
+      }
+    } ]);
+
+controllers.controller("AppDetailsController", [ '$scope', '$interval', '$rootScope', '$http',
+    '$routeParams', function($scope, $interval, $rootScope, $http, $routeParams) {
+      $scope.details = {"yarnfile":{"state":"UNKNOWN"}};
+      $scope.appName = $routeParams.id;
+      var timer = $interval(function() {
+        $scope.refreshAppDetails();
+      }, 2000);
+
+      $scope.refreshAppDetails = function() {
+        $http({
+          method : 'GET',
+          url : '/v1/app_details/status/' + $scope.appName
+        }).then(successCallback, errorCallback);
+      }
+
+      $scope.stopApp = function(id) {
+        $http({
+          method : 'POST',
+          url : '/v1/app_details/stop/' + id
+        }).then(function(data, status, header, config) {
+          $scope.refreshAppDetails();
+        }, errorCallback);
+      }
+
+      $scope.restartApp = function(id) {
+        $http({
+          method : 'POST',
+          url : '/v1/app_details/restart/' + id
+        }).then(function(data, status, header, config) {
+          $scope.refreshAppDetails();
+        }, errorCallback);
+      }
+
+      $scope.canDeployApp = function() {
+        return true;
+      };
+
+      $scope.checkServiceLink = function() {
+        if ($scope.details.yarnfile.state != "STABLE") {
+          return true;
+        } else {
+          return false;
+        }
+      }
+
+      function successCallback(response) {
+        if (response.data.yarnfile.components.length!=0) {
+          $scope.details = response.data;
+        } else {
+          // When application is in accepted or failed state, it does not
+          // have components detail, hence we update states only.
+          $scope.details.yarnfile.state = response.data.yarnfile.state;
+        }
+      }
+
+      function errorCallback(response) {
+        console.log("Error in getting application detail");
+      }
+
+      $rootScope.$on("RefreshAppDetails", function() {
+        $scope.refreshAppDetails();
+      });
+
+      $scope.$on("$locationChangeStart", function() {
+        $interval.cancel(timer);
+      });
+
+      $scope.$on('$destroy', function() {
+        $interval.cancel(timer);
+      });
+
+      $http({
+        method : 'GET',
+        url : '/v1/app_details/config/' + $scope.appName
+      }).then(successCallback, errorCallback);
+
+    } ]);
+
+controllers.controller("NewAppController", [ '$scope', '$rootScope', '$http', function($scope, $rootScope, $http) {
+    $scope.details = {
+        "name" : "",
+        "version" : "",
+        "organization" : "",
+        "description" : "",
+        "quicklinks": {
+          "UI": "http://${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+        },
+        "icon" : "",
+        "components" : [
+          {
+            "name" : "",
+            "number_of_containers" : 1,
+            "artifact" : {
+              "id": "centos:latest"
+            },
+            "launch_command": "",
+            "resource" : {
+              "cpus" : 1,
+              "memory" : 2048
+            },
+            "run_privileged_container" : false,
+            "dependencies" : [],
+            "placement_policy" : {
+              "constraints" : []
+            },
+            "configuration" : {
+              "env" : {
+                "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true"
+              },
+              "properties" : {
+                "docker.network":"host"
+              }
+            }
+          }
+        ]
+    };
+
+    $scope.template = {
+        "name" : "",
+        "number_of_containers" : 1,
+        "artifact" : {
+          "id": "centos:latest"
+        },
+        "launch_command": "",
+        "resource" : {
+          "cpus" : 1,
+          "memory" : 2048
+        },
+        "run_privileged_container" : false,
+        "dependencies" : [],
+        "placement_policy" : {
+          "constraints" : []
+        },
+        "configuration" : {
+          "env" : {
+            "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true"
+          },
+          "properties" : {
+            "docker.network":"host"
+          }
+        }
+    };
+
+    $scope.message = null;
+    $scope.error = null;
+
+    $scope.save = function() {
+      $http({
+        method : 'POST',
+        url : '/v1/app_store/register',
+        data : JSON.stringify($scope.details)
+      }).then(successCallback, errorCallback)
+    }
+
+    $scope.add = function() {
+      $scope.details.components.push($scope.template);
+    }
+
+    $scope.remove = function(index) {
+      $scope.details.components.splice(index, 1);
+    }
+
+    function successCallback(response) {
+      $scope.message = "Application published successfully.";
+      setTimeout(function() {
+        $scope.$apply(function() {
+          window.location = '/#';
+        });
+      }, 5000);
+    }
+
+    function errorCallback(response) {
+      $scope.error = "Error in registering application configuration.";
+    }
+
+    } ]);
+
+controllers.controller("DeployAppController", [ '$scope', '$rootScope', '$http',
+    '$routeParams', function($scope, $rootScope, $http, $routeParams) {
+    $scope.id = $routeParams.id;
+
+    function successCallback(response) {
+      $scope.details = response.data;
+      $rootScope.$emit("hideLoadScreen", {});
+    }
+
+    function errorCallback(response) {
+      $rootScope.$emit("hideLoadScreen", {});
+      console.log("Error in downloading application template.");
+    }
+
+    $scope.launchApp = function(app) {
+      $rootScope.$emit("showLoadScreen", {});
+      $http({
+        method : 'POST',
+        url : '/v1/app_list/' + $scope.id,
+        data : JSON.stringify($scope.details.app)
+      }).then(function(data, status, headers, config) {
+        $rootScope.$emit("RefreshAppList", {});
+        window.location = '/#!/app/' + data.data.id;
+      }, function(data, status, headers, config) {
+        console.log('error', data, status);
+      });
+    }
+
+    $http({
+      method : 'GET',
+      url : '/v1/app_store/get/' + $scope.id
+    }).then(successCallback, errorCallback);
+
+}]);
+
+controllers.controller("LoadScreenController", [ '$scope', '$rootScope', '$http', function($scope, $rootScope, $http) {
+  $scope.loadScreen = "hide";
+
+  $rootScope.$on("showLoadScreen", function() {
+    $scope.loadScreen = "show";
+  });
+
+  $rootScope.$on("hideLoadScreen", function() {
+    $scope.loadScreen = "hide";
+  });
+
+}]);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js
new file mode 100644
index 00000000000..bfb6838a6bf
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var app = angular.module("filters", []);
+
+app.filter("counterValue",function(){
+  return function(value){
+    var count=parseInt(value), suffix="";
+    if (count>=1000000){
+      count=Math.round(count/1000000);
+      suffix="M"
+    } else if (count>=1000){
+      count=Math.round(count/1000);
+      suffix="K"
+    }
+    return""+count+suffix
+  }
+});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js
new file mode 100644
index 00000000000..d5519133edc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js
new file mode 100644
index 00000000000..d5519133edc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties
new file mode 100644
index 00000000000..443b1082c1f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties
@@ -0,0 +1 @@
+solr_url=http://localhost:8983/solr/appcatalog/
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties
new file mode 100644
index 00000000000..9a0c6083045
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties
@@ -0,0 +1,23 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+log4j.rootLogger = INFO, CATALINA
+
+# Define all the appenders
+log4j.appender.CATALINA = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.CATALINA.File = ${catalina.base}/logs/appcatalog.log
+log4j.appender.CATALINA.Append = true
+log4j.appender.CATALINA.Encoding = UTF-8
+# Roll-over the log once per day
+log4j.appender.CATALINA.DatePattern = '.'yyyy-MM-dd'.log'
+log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
+log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore
new file mode 100644
index 00000000000..a725465aee2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore
@@ -0,0 +1 @@
+vendor/
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 00000000000..3326fa10766
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="annotated">
+</beans>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..fac7c5bba00
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+   version="3.0">
+
+    <context-param>
+      <param-name>local-deployment</param-name>
+      <param-value>true</param-value>
+    </context-param>
+
+
+    <description>
+      YARN Application Catalog
+    </description>
+    <display-name>appcatalog</display-name>
+
+    <servlet>
+      <servlet-name>REST_API</servlet-name>
+      <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+      <init-param>
+        <param-name>com.sun.jersey.config.property.packages</param-name>
+        <param-value>org.apache.hadoop.yarn.appcatalog.controller;com.wordnik.swagger.jaxrs.listing;com.wordnik.swagger.jaxrs.json</param-value>
+      </init-param>
+      <init-param>
+        <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+        <param-value>true</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+      <servlet-name>DefaultJaxrsConfig</servlet-name>
+      <servlet-class>com.wordnik.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+      <init-param>
+        <param-name>api.version</param-name>
+        <param-value>3</param-value>
+      </init-param>
+      <init-param>
+        <param-name>swagger.api.basepath</param-name>
+        <param-value>http://localhost:8080/v1</param-value>
+      </init-param>
+      <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+      <servlet-name>REST_API</servlet-name>
+      <url-pattern>/v1/*</url-pattern>
+    </servlet-mapping>
+
+    <filter>
+       <filter-name>CorsFilter</filter-name>
+       <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+     </filter>
+     <filter-mapping>
+       <filter-name>CorsFilter</filter-name>
+       <url-pattern>/*</url-pattern>
+     </filter-mapping>
+
+</web-app>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css
new file mode 100644
index 00000000000..92daf06bc65
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css
@@ -0,0 +1,1489 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@font-face {
+  font-family: 'Roboto';
+  font-weight: normal;
+  font-style: normal;
+  src: url('fonts/Roboto-Regular-webfont.eot');
+  src: url('fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('fonts/Roboto-Regular-webfont.woff') format('woff'), url('fonts/Roboto-Regular-webfont.ttf') format('truetype'), url('fonts/Roboto-Regular-webfont.svg#robotoregular') format('svg');
+}
+.font-mixin {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+}
+.btn,
+.btn:focus {
+  outline: none;
+  font-family: 'Roboto', sans-serif;
+  text-transform: uppercase;
+  height: 34px;
+  font-size: 14px;
+  padding: 10px 20px;
+  line-height: 14px;
+}
+.btn .glyphicon,
+.btn:focus .glyphicon {
+  top: -1px;
+  float: left;
+}
+.box-shadow {
+  box-shadow: 0 0 2px 0 #1391c1;
+}
+.btn-disabled {
+  opacity: 0.6;
+  box-shadow: none;
+}
+.btn-default-disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #FFF;
+  background-color: #808793;
+  border: none;
+}
+.btn-default,
+.btn-default:focus {
+  color: #666;
+  background-color: #FFF;
+  border: 1px solid #CFD3D7;
+}
+.btn-default:hover,
+.btn-default:focus:hover {
+  color: #FFF;
+  background-color: #808793;
+}
+.btn-default:active,
+.btn-default:focus:active {
+  color: #666;
+  background-color: #FFF;
+  border: 1px solid #CFD3D7;
+  box-shadow: 0 0 2px 0 #1391c1;
+}
+.btn-default[disabled],
+.btn-default:focus[disabled],
+.btn-default.disabled,
+.btn-default:focus.disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #FFF;
+  background-color: #808793;
+  border: none;
+}
+.btn-default[disabled]:active,
+.btn-default:focus[disabled]:active,
+.btn-default.disabled:active,
+.btn-default:focus.disabled:active,
+.btn-default[disabled].active,
+.btn-default:focus[disabled].active,
+.btn-default.disabled.active,
+.btn-default:focus.disabled.active,
+.btn-default[disabled]:hover,
+.btn-default:focus[disabled]:hover,
+.btn-default.disabled:hover,
+.btn-default:focus.disabled:hover {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #FFF;
+  background-color: #808793;
+  border: none;
+}
+.btn-primary-disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+}
+.btn-primary,
+.btn-primary:focus {
+  color: #FFF;
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+}
+.btn-primary:hover,
+.btn-primary:focus:hover {
+  color: #FFF;
+  background-color: #429929;
+  border: 1px solid #429929;
+}
+.btn-primary:active,
+.btn-primary:focus:active,
+.btn-primary.active,
+.btn-primary:focus.active {
+  color: #FFF;
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+  box-shadow: 0 0 2px 0 #1391c1;
+}
+.btn-primary[disabled],
+.btn-primary:focus[disabled],
+.btn-primary.disabled,
+.btn-primary:focus.disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+}
+.btn-primary[disabled]:active,
+.btn-primary:focus[disabled]:active,
+.btn-primary.disabled:active,
+.btn-primary:focus.disabled:active,
+.btn-primary[disabled].active,
+.btn-primary:focus[disabled].active,
+.btn-primary.disabled.active,
+.btn-primary:focus.disabled.active,
+.btn-primary[disabled]:hover,
+.btn-primary:focus[disabled]:hover,
+.btn-primary.disabled:hover,
+.btn-primary:focus.disabled:hover {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+}
+.btn-secondary-disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #429929;
+  border: 1px solid #3FAE2A;
+}
+.btn-secondary,
+.btn-secondary:focus {
+  color: #429929;
+  background-color: #FFF;
+  border: 1px solid #3FAE2A;
+}
+.btn-secondary:hover,
+.btn-secondary:focus:hover {
+  color: #FFF;
+  background-color: #429929;
+}
+.btn-secondary:active,
+.btn-secondary:focus:active {
+  color: #429929;
+  background-color: #FFF;
+  box-shadow: 0 0 2px 0 #1391c1;
+}
+.btn-secondary[disabled],
+.btn-secondary:focus[disabled],
+.btn-secondary.disabled,
+.btn-secondary:focus.disabled {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #429929;
+  border: 1px solid #3FAE2A;
+}
+.btn-secondary[disabled]:active,
+.btn-secondary:focus[disabled]:active,
+.btn-secondary.disabled:active,
+.btn-secondary:focus.disabled:active,
+.btn-secondary[disabled].active,
+.btn-secondary:focus[disabled].active,
+.btn-secondary.disabled.active,
+.btn-secondary:focus.disabled.active,
+.btn-secondary[disabled]:hover,
+.btn-secondary:focus[disabled]:hover,
+.btn-secondary.disabled:hover,
+.btn-secondary:focus.disabled:hover {
+  opacity: 0.6;
+  box-shadow: none;
+  color: #D1E8D1;
+  background-color: #429929;
+  border: 1px solid #3FAE2A;
+}
+.btn-success {
+  border: none;
+}
+.btn-regular-default-state {
+  background-color: #FFF;
+  color: #666;
+  border: 1px solid #cfd3d7;
+}
+.btn-primary-default-state {
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+  color: #FFF;
+}
+.btn-group.open .btn.dropdown-toggle,
+.dropdown.open .btn.dropdown-toggle {
+  box-shadow: inset 0px 0px 3px 0px #1391c1;
+}
+.btn-group.open .btn.dropdown-toggle,
+.dropdown.open .btn.dropdown-toggle,
+.btn-group.open .btn.dropdown-toggle.btn-default,
+.dropdown.open .btn.dropdown-toggle.btn-default {
+  background-color: #FFF;
+  color: #666;
+  border: 1px solid #cfd3d7;
+}
+.btn-group.open .btn.dropdown-toggle:hover,
+.dropdown.open .btn.dropdown-toggle:hover,
+.btn-group.open .btn.dropdown-toggle.btn-default:hover,
+.dropdown.open .btn.dropdown-toggle.btn-default:hover {
+  background-color: #FFF;
+  color: #666;
+  border: 1px solid #cfd3d7;
+}
+.btn-group.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
+.dropdown.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
+.btn-group.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover,
+.dropdown.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover {
+  background-color: #808793;
+  color: #FFF;
+}
+.btn-group.open .btn.dropdown-toggle.btn-primary,
+.dropdown.open .btn.dropdown-toggle.btn-primary {
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+  color: #FFF;
+}
+.btn-group.open .btn.dropdown-toggle.btn-primary:hover,
+.dropdown.open .btn.dropdown-toggle.btn-primary:hover {
+  background-color: #3FAE2A;
+  border: 1px solid #3FAE2A;
+  color: #FFF;
+}
+.btn-group.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover,
+.dropdown.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover {
+  background-color: #429929;
+  color: #FFF;
+}
+.btn-group.open .dropdown-menu,
+.dropdown.open .dropdown-menu {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  border-radius: 2px;
+  font-size: 14px;
+  min-width: 200px;
+  background: #FFF;
+  color: #666;
+  border: 1px solid #cfd3d7;
+}
+.btn-group.open .dropdown-menu > li,
+.dropdown.open .dropdown-menu > li {
+  margin-bottom: 1px;
+}
+.btn-group.open .dropdown-menu > li > a,
+.dropdown.open .dropdown-menu > li > a {
+  height: 24px;
+}
+.btn-group .btn.dropdown-toggle:first-child,
+.dropdown .btn.dropdown-toggle:first-child {
+  min-width: 80px;
+}
+.btn-group .btn.dropdown-toggle.disabled,
+.dropdown .btn.dropdown-toggle.disabled,
+.btn-group .btn.dropdown-toggle[disabled],
+.dropdown .btn.dropdown-toggle[disabled] {
+  opacity: 0.6;
+}
+input.form-control {
+  font-size: 14px;
+  border-radius: 2px;
+  color: #666;
+  border: 1px solid #CFD3D7;
+  height: 34px;
+  padding: 10px;
+}
+input.form-control:focus {
+  border-color: #1291c1;
+  box-shadow: none;
+}
+.help-block {
+  color: #999999;
+  font-size: 14px;
+}
+.help-block.validation-block {
+  color: #999999;
+  margin-top: 10px;
+}
+.help-block.validation-block::before {
+  position: relative;
+  top: 2px;
+  margin-right: 5px;
+  font-family: 'Glyphicons Halflings';
+}
+.has-success input.form-control {
+  color: #666;
+  border: 1px solid #1EB475;
+}
+.has-success input.form-control:focus {
+  border-color: #1EB475;
+  box-shadow: none;
+}
+.has-success .help-block.validation-block::before {
+  content: '\e084';
+  color: #1EB475;
+}
+.has-error input.form-control {
+  color: #666;
+  border: 1px solid #EF6162;
+}
+.has-error input.form-control:focus {
+  border-color: #EF6162;
+  box-shadow: none;
+}
+.has-error .help-block.validation-block::before {
+  content: '\e083';
+  color: #EF6162;
+}
+.has-warning input.form-control {
+  color: #666;
+  border: 1px solid #E98A40;
+}
+.has-warning input.form-control:focus {
+  border-color: #E98A40;
+  box-shadow: none;
+}
+.has-warning .help-block.validation-block::before {
+  content: '\e101';
+  color: #E98A40;
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  color: #999999;
+  border-color: #cccccc;
+  background-color: #dddddd;
+}
+h2.table-title {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  margin-top: 10px;
+  font-size: 20px;
+}
+.table {
+  color: #666;
+  font-size: 13px;
+}
+.table thead,
+.table tfoot {
+  color: #999;
+}
+.table input[type="checkbox"] + label {
+  position: relative;
+  line-height: 1.3em;
+  font-size: initial;
+  top: 4px;
+  margin-bottom: 0;
+}
+.table thead > tr > th {
+  border-bottom-color: #EEE;
+}
+.table tfoot > tr:first-of-type > td {
+  border-top-width: 2px;
+  border-top-color: #EEE;
+}
+.table > tbody > tr > td {
+  border-top-color: #EEE;
+}
+.table > tbody > tr.active {
+  background-color: #EEE;
+}
+.table > tbody > tr.active > td {
+  background-color: #EEE;
+}
+.table.table-hover .action {
+  visibility: hidden;
+  padding: 0;
+  line-height: 1;
+}
+.table.table-hover .action:hover {
+  text-decoration: none;
+}
+.table.table-hover > tbody > tr {
+  border-width: 0 1px 1px;
+  border-style: solid;
+  border-color: #EEE transparent;
+}
+.table.table-hover > tbody > tr > td {
+  border-width: 0;
+}
+.table.table-hover > tbody > tr:hover {
+  border-color: #A7DFF2;
+  background-color: #E7F6FC;
+}
+.table.table-hover > tbody > tr:hover > td {
+  border-top: 1px solid #A7DFF2;
+  background-color: #E7F6FC;
+}
+.table.table-hover > tbody > tr:hover > td .action {
+  visibility: visible;
+}
+.table.table-hover > tbody > tr:first-of-type > td {
+  border-top: 1px solid transparent;
+}
+.table.table-hover > tbody > tr:first-of-type:hover > td {
+  border-color: #A7DFF2;
+}
+.pagination-block .pagination-block-item {
+  float: left;
+  padding: 0 5px;
+}
+.pagination-block .pagination-block-item a,
+.pagination-block .pagination-block-item a:visited,
+.pagination-block .pagination-block-item a:focus {
+  text-decoration: none;
+}
+.pagination-block .pagination-block-item select {
+  border: none;
+  background-color: transparent;
+  color: #1491C1;
+}
+.nav.nav-tabs {
+  border: none;
+  margin-bottom: 20px;
+}
+.nav.nav-tabs li a {
+  border-width: 0;
+  border-radius: 0;
+  border-bottom: 2px solid transparent;
+  color: #666;
+  text-transform: uppercase;
+}
+.nav.nav-tabs li a:hover,
+.nav.nav-tabs li a:active,
+.nav.nav-tabs li a:focus {
+  color: #333;
+  border-top-width: 0;
+  border-left-width: 0;
+  border-right-width: 0;
+  background: none;
+}
+.nav.nav-tabs li a .badge.badge-important {
+  display: inline;
+}
+.nav.nav-tabs li.active a {
+  color: #333;
+  border-bottom: 2px solid #3FAE2A;
+}
+.nav-tabs-left li,
+.nav-tabs-right li {
+  float: none;
+  margin-bottom: 2px;
+}
+.nav-tabs-left li a,
+.nav-tabs-right li a {
+  margin-right: 0;
+}
+.nav-tabs-left li {
+  margin-right: -1px;
+}
+.nav-tabs-left li a {
+  border: 2px solid transparent !important;
+}
+.nav-tabs-left li.active a,
+.nav-tabs-left li.active a:hover,
+.nav-tabs-left li.active a:active,
+.nav-tabs-left li.active a:focus {
+  border-right: 2px solid #3FAE2A !important;
+}
+.nav-tabs-right li {
+  margin-left: -1px;
+}
+.nav-tabs-right li a {
+  border: 2px solid transparent !important;
+}
+.nav-tabs-right li.active a,
+.nav-tabs-right li.active a:hover,
+.nav-tabs-right li.active a:active,
+.nav-tabs-right li.active a:focus {
+  border-left: 2px solid #3FAE2A !important;
+}
+.wizard {
+  border: 2px solid #ebecf1;
+}
+.wizard .wizard-header h3 {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  font-size: 20px;
+  color: #333;
+  margin: 15px 20px;
+}
+.wizard .wizard-body {
+  overflow: hidden;
+  margin: 0;
+}
+.wizard .wizard-body .wizard-content {
+  background: #ebecf1;
+  padding-top: 25px;
+  float: left;
+  margin-bottom: -99999px;
+  padding-bottom: 99999px;
+}
+.wizard .wizard-body .wizard-content .step-title {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-weight: bold;
+  font-size: 18px;
+  color: #666;
+}
+.wizard .wizard-body .wizard-content .step-description {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+  line-height: 1.4;
+  color: #999;
+}
+.wizard .wizard-body .wizard-content .panel.panel-default {
+  border: none;
+  box-shadow: none;
+  margin-top: 20px;
+}
+.wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
+  padding: 30px 20px;
+}
+.wizard .wizard-body .wizard-nav {
+  min-height: 550px;
+  padding-top: 25px;
+  background-color: #323544;
+  float: left;
+  margin-bottom: -99999px;
+  padding-bottom: 99999px;
+}
+.wizard .wizard-body .wizard-nav .nav li {
+  padding: 0px 15px;
+}
+.wizard .wizard-body .wizard-nav .nav li a {
+  height: 48px;
+  padding: 0px 5px;
+  display: table-cell;
+  vertical-align: middle;
+}
+.wizard .wizard-body .wizard-nav .nav li .step-marker {
+  position: absolute;
+  top: 9px;
+  line-height: 16px;
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  border: 2px solid #1EB475;
+  border-radius: 50%;
+  font-size: 12px;
+  font-style: inherit;
+  color: #1EB475;
+  background-color: #323544;
+}
+.wizard .wizard-body .wizard-nav .nav li .step-name {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+  color: #999;
+  margin-left: 30px;
+}
+.wizard .wizard-body .wizard-nav .nav li .step-index {
+  line-height: 18px;
+}
+.wizard .wizard-body .wizard-nav .nav li .step-description {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 12px;
+  color: #999;
+  margin-left: 30px;
+}
+.wizard .wizard-body .wizard-nav .nav li.completed .step-marker {
+  background-color: #1EB475;
+  color: white;
+  font-size: 10px;
+  padding-left: 2px;
+}
+.wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index {
+  display: none;
+}
+.wizard .wizard-body .wizard-nav .nav li.completed .step-marker:after {
+  font-family: "Glyphicons Halflings";
+  content: "\e013";
+  position: relative;
+  top: 1px;
+  left: -1px;
+}
+.wizard .wizard-body .wizard-nav .nav li.completed:after {
+  width: 2px;
+  height: 100%;
+  position: absolute;
+  background-color: #1EB475;
+  content: "";
+  top: 25px;
+  left: 29px;
+}
+.wizard .wizard-body .wizard-nav .nav li.completed:last-child:after {
+  content: none;
+}
+.wizard .wizard-body .wizard-nav .nav li.active .step-name {
+  font-weight: bold;
+}
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-marker {
+  color: #666;
+  border-color: #666;
+}
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-name,
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-description {
+  color: #666;
+}
+.wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
+  background-color: #1EB475;
+  border: 2px solid #1EB475;
+  color: white;
+}
+.wizard .wizard-body .wizard-nav .nav-pills > li.active > a,
+.wizard .wizard-body .wizard-nav .nav-pills > li.active > a:focus,
+.wizard .wizard-body .wizard-nav .nav-pills > li.active > a:hover,
+.wizard .wizard-body .wizard-nav .nav > li > a:focus,
+.wizard .wizard-body .wizard-nav .nav > li > a:hover {
+  background-color: inherit;
+}
+.wizard .wizard-body .wizard-footer {
+  background: white;
+  padding: 15px 20px;
+}
+.wizard .wizard-body .wizard-footer button {
+  margin: 0 10px;
+}
+.checkbox-disabled-style {
+  background-color: #b2b8c1;
+  border-color: #b2b8c1;
+}
+input[type="checkbox"]:not(:checked),
+input[type="radio"]:not(:checked),
+input[type="checkbox"]:checked,
+input[type="radio"]:checked {
+  display: none;
+}
+input[type="checkbox"]:not(:checked) + label,
+input[type="radio"]:not(:checked) + label,
+input[type="checkbox"]:checked + label,
+input[type="radio"]:checked + label {
+  position: relative;
+  padding-left: 20px;
+}
+input[type="checkbox"]:not(:checked) + label:hover:before,
+input[type="radio"]:not(:checked) + label:hover:before,
+input[type="checkbox"]:checked + label:hover:before,
+input[type="radio"]:checked + label:hover:before {
+  border-color: #1491C1;
+  background-color: #1491C1;
+}
+input[type="checkbox"]:checked + label:before,
+input[type="radio"]:checked + label:before {
+  background-color: #1491C1;
+  border-color: #1491C1;
+}
+input[type="checkbox"][disabled] + label:before,
+input[type="radio"][disabled] + label:before,
+input[type="checkbox"].disabled + label:before,
+input[type="radio"].disabled + label:before,
+input[type="checkbox"][disabled] + label:hover:before,
+input[type="radio"][disabled] + label:hover:before,
+input[type="checkbox"].disabled + label:hover:before,
+input[type="radio"].disabled + label:hover:before {
+  background-color: #b2b8c1;
+  border-color: #b2b8c1;
+}
+input[type="checkbox"] + label:before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 4px;
+  width: 10px;
+  height: 10px;
+  box-sizing: border-box;
+  border-radius: 2px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+}
+input[type="checkbox"]:checked + label:after {
+  content: '\2714';
+  color: #FFF;
+  position: absolute;
+  top: 0;
+  left: 2px;
+  font-size: 9px;
+}
+input[type="radio"] + label:before,
+input.radio + label:before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  border-radius: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+}
+input[type="radio"]:checked + label:after,
+input.radio:checked + label:after {
+  content: '';
+  background-color: #FFF;
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  width: 6px;
+  height: 6px;
+  border-radius: 6px;
+}
+.navigation-bar-container {
+  height: auto;
+  width: 230px;
+  background-color: #323544;
+  padding: 0;
+  -ms-overflow-style: none;
+  transition: width 0.5s ease-out;
+  -webkit-font-smoothing: antialiased;
+}
+.navigation-bar-container ul.nav.side-nav-header {
+  width: 230px;
+  transition: width 0.5s ease-out;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header {
+  background: #313d54;
+  padding: 15px 5px 15px 25px;
+  height: 55px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header > a.ambari-logo {
+  padding: 0;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header > a.ambari-logo > img {
+  height: 25px;
+  float: left;
+  margin-left: -3px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group {
+  cursor: pointer;
+  margin-top: 3px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.ambari-header,
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.toggle-icon {
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.ambari-header {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 20px;
+  width: 55px;
+  display: inline;
+  color: #b8bec4;
+  padding: 0 8px 0 10px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.toggle-icon {
+  margin-bottom: 5px;
+  font-size: 13px;
+  display: inline-block;
+  vertical-align: middle;
+  color: #b8bec4;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu {
+  top: 30px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li > a {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+  color: #666;
+  line-height: 1.42;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li > a:hover {
+  background: #f5f5f5;
+}
+.navigation-bar-container ul.nav.side-nav-menu,
+.navigation-bar-container ul.nav.side-nav-footer {
+  background-color: #323544;
+  width: 230px;
+  transition: width 0.5s ease-out;
+}
+.navigation-bar-container ul.nav.side-nav-menu li,
+.navigation-bar-container ul.nav.side-nav-footer li {
+  padding: 0;
+  margin: 0;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+  display: table-cell;
+  vertical-align: middle;
+  width: 230px;
+  border-radius: 0;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  white-space: nowrap;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .navigation-menu-item {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+  color: #b8bec4;
+  padding-left: 8px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .navigation-icon {
+  line-height: 18px;
+  font-size: 18px;
+  color: #b8bec4;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .toggle-icon {
+  line-height: 14px;
+  font-size: 14px;
+  color: #b8bec4;
+  padding: 3px 5px 3px 10px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+  padding: 10px 5px 10px 20px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a {
+  padding: 10px 5px 10px 25px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
+  background: #313d54;
+  height: 50px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon {
+  color: #31823a;
+  font-size: 20px;
+  position: relative;
+  padding: 0 15px;
+  left: calc(30%);
+}
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon:hover,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon:hover {
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li {
+  background-color: #323544;
+}
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li a,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li a {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+  color: #999;
+}
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li a .submenu-icon,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li a .submenu-icon {
+  line-height: 14px;
+  font-size: 14px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover,
+.navigation-bar-container ul.nav.side-nav-menu li > a:hover,
+.navigation-bar-container ul.nav.side-nav-footer li > a:hover {
+  background: #404351;
+  cursor: pointer;
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li > a:hover .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li > a:hover .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li > a:hover .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li > a:hover .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li > a:hover .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li > a:hover .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .submenu-item,
+.navigation-bar-container ul.nav.side-nav-menu li > a:hover .submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li > a:hover .submenu-item {
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu),
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu),
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed {
+  background: #404351;
+  cursor: pointer;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a {
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .toggle-icon {
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a:after,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a:after,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a:after,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a:after {
+  left: 0;
+  top: 50%;
+  border: solid transparent;
+  border-width: 10px 7px;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+  border-color: transparent;
+  border-left-color: #31823a;
+  margin-top: -12px;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions {
+  display: none;
+  position: absolute;
+  top: 14px;
+  right: 33px;
+  line-height: 25px;
+  width: 20px;
+  text-align: center;
+  font-size: 14px;
+  cursor: pointer;
+  vertical-align: middle;
+  color: #fff;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a {
+  color: #666;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a i,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a i {
+  color: #666;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a:hover,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a:hover {
+  background: #f5f5f5;
+}
+.navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
+.navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
+  display: inline-block;
+  vertical-align: bottom;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.navigation-bar-container .nav-pills > li.active > a,
+.navigation-bar-container .nav-pills > li.active > a:focus,
+.navigation-bar-container .nav-pills > li.active > a:hover,
+.navigation-bar-container .nav > li > a:focus,
+.navigation-bar-container .nav > li > a:hover {
+  background-color: inherit;
+}
+.navigation-bar-container.collapsed {
+  width: 50px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-header {
+  width: 50px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header {
+  padding: 15px 0 15px 15px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.ambari-header,
+.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.toggle-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header .dropdown-menu {
+  display: none;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer {
+  width: 50px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li a,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li a {
+  padding: 15px 0 15px 15px;
+  width: 50px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .navigation-menu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .navigation-menu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .toggle-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .toggle-icon {
+  display: none;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.navigation-footer a .navigation-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.navigation-footer a .navigation-icon {
+  padding: 0 5px;
+  left: 0;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.sub-menu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu {
+  display: none;
+  width: 230px;
+  position: absolute;
+  z-index: 100;
+  top: 0;
+  left: 50px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li > a {
+  padding: 10px 5px 10px 25px;
+  width: 230px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active {
+  background: #404351;
+  cursor: pointer;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a {
+  color: #fff;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .navigation-menu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .navigation-menu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .submenu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .submenu-item,
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .navigation-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .navigation-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .toggle-icon,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .toggle-icon {
+  color: #fff;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a:after,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a:after {
+  left: 0;
+  top: 50%;
+  border: solid transparent;
+  border-width: 12px 6px;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+  border-color: transparent;
+  border-left-color: #31823a;
+  margin-top: -12px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions {
+  display: none;
+}
+.navigation-bar-fit-height {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 2079;
+}
+.navigation-bar-fit-height .side-nav-header {
+  position: absolute;
+  top: 0;
+}
+.navigation-bar-fit-height .side-nav-menu {
+  position: absolute;
+  top: 55px;
+  bottom: 50px;
+}
+.navigation-bar-fit-height .side-nav-footer {
+  position: absolute;
+  bottom: 0;
+}
+.navigation-bar-fit-height .more-actions .dropdown-menu {
+  position: fixed;
+  top: auto;
+  left: auto;
+}
+.navigation-bar-fit-height .navigation-bar-container {
+  height: 100%;
+}
+.navigation-bar-fit-height .navigation-bar-container .side-nav-menu {
+  overflow-y: auto;
+}
+.notifications-group {
+  position: relative;
+  top: 1px;
+}
+#notifications-dropdown.dropdown-menu {
+  min-width: 300px;
+  max-width: 300px;
+  min-height: 150px;
+  padding: 0px;
+  z-index: 1000;
+  right: -50px;
+  left: auto;
+  top: 260%;
+  border: none;
+  -webkit-box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+  -moz-box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+  box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+}
+#notifications-dropdown.dropdown-menu .popup-arrow-up {
+  position: absolute;
+  right: 37px;
+  top: -40px;
+  width: 40px;
+  height: 40px;
+  overflow: hidden;
+}
+#notifications-dropdown.dropdown-menu .popup-arrow-up:after {
+  content: "";
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  background: #fff;
+  transform: rotate(45deg);
+  top: 30px;
+  left: 10px;
+  box-shadow: -1px -1px 10px -2px rgba(0, 0, 0, 0.5);
+}
+#notifications-dropdown.dropdown-menu .notifications-header {
+  border-bottom: 1px solid #eee;
+  padding: 15px 20px;
+}
+#notifications-dropdown.dropdown-menu .notifications-header .notifications-title {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 16px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body {
+  padding: 0px 15px;
+  overflow: auto;
+  max-height: 500px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .no-alert-text {
+  padding: 15px 5px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table-controls {
+  padding: 10px 0px;
+  margin: 0px;
+  border-bottom: 1px solid #eee;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter {
+  padding: 0px;
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 12px;
+  color: #666;
+  position: relative;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter .form-control.filter-select {
+  font-size: 12px;
+  color: #666;
+  height: 25px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table {
+  margin-top: 0px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr {
+  cursor: pointer;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover {
+  cursor: default;
+  border-color: transparent;
+  border-bottom-color: #eee;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover > td {
+  border-color: transparent;
+  background-color: white;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status {
+  width: 9%;
+  padding: 15px 3px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-CRITICAL {
+  color: #EF6162;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-WARNING {
+  color: #E98A40;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content {
+  width: 90%;
+  padding: 15px 3px 10px 3px;
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  line-height: 1.3;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .name {
+  font-weight: bold;
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 5px;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .description {
+  font-size: 12px;
+  color: #666;
+  margin-bottom: 4px;
+  display: block;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  max-height: 47px;
+  /* For firefox */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  /* Break long urls*/
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  -ms-word-break: break-all;
+  word-break: break-all;
+  word-break: break-word;
+  /* Adds a hyphen where the word breaks*/
+  -ms-hyphens: auto;
+  -moz-hyphens: auto;
+  -webkit-hyphens: auto;
+  hyphens: auto;
+}
+#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .timestamp {
+  text-align: right;
+  font-size: 11px;
+  color: #999;
+}
+#notifications-dropdown.dropdown-menu .notifications-footer {
+  border-top: 1px solid #eee;
+  padding: 15px;
+}
+.modal-backdrop {
+  background-color: #808080;
+}
+.modal .modal-content {
+  border-radius: 2px;
+}
+.modal .modal-content .modal-header,
+.modal .modal-content .modal-body,
+.modal .modal-content .modal-footer {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.modal .modal-content .modal-header {
+  border-bottom: none;
+  padding-top: 20px;
+  color: #666;
+  font-size: 20px;
+}
+.modal .modal-content .modal-header h4 {
+  margin: 0;
+  color: inherit;
+  font-size: inherit;
+}
+.modal .modal-content .modal-body {
+  color: #666;
+  font-size: 12px;
+}
+.modal .modal-content .modal-footer {
+  border-top: none;
+  padding-bottom: 20px;
+}
+.modal .modal-content .modal-footer .btn ~ .btn {
+  margin-left: 10px;
+}
+.accordion .panel-group,
+.wizard .wizard-body .wizard-content .accordion .panel-group {
+  margin-bottom: 0px;
+}
+.accordion .panel-group .panel,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel {
+  border-radius: 0px;
+  border: none;
+  margin-top: 0px;
+}
+.accordion .panel-group .panel .panel-heading,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading {
+  height: 50px;
+  padding: 15px 10px;
+  border: 1px solid;
+  border-color: #ddd transparent;
+  border-top: none;
+  background: #fff;
+}
+.accordion .panel-group .panel .panel-heading .panel-title,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+}
+.accordion .panel-group .panel .panel-heading .panel-title > a,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title > a {
+  font-size: 18px;
+  color: #333;
+}
+.accordion .panel-group .panel .panel-heading .panel-title > i,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title > i {
+  font-size: 20px;
+  color: #1491c1;
+}
+.accordion .panel-group .panel .panel-heading:hover,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading:hover {
+  background: #f3faff;
+  cursor: pointer;
+}
+.accordion .panel-group .panel .panel-body,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-body {
+  padding: 15px 10px 20px 20px;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+  font-family: 'Roboto', sans-serif;
+}
+h1,
+.h1 {
+  font-size: 24px;
+}
+h2,
+.h2 {
+  font-size: 18px;
+}
+body,
+.body {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  font-size: 14px;
+}
+.description {
+  font-family: 'Roboto', sans-serif;
+  font-size: 12px;
+  color: #000;
+}
+a,
+a:visited,
+a:focus {
+  color: #1491C1;
+  text-decoration: none;
+}
+a:hover,
+a:visited:hover,
+a:focus:hover {
+  text-decoration: underline;
+}
+a:active,
+a:visited:active,
+a:focus:active {
+  text-decoration: none;
+}
+a[disabled],
+a:visited[disabled],
+a:focus[disabled],
+a.disabled,
+a:visited.disabled,
+a:focus.disabled {
+  cursor: not-allowed;
+  color: #666;
+  text-decoration: none;
+}
+a[disabled]:hover,
+a:visited[disabled]:hover,
+a:focus[disabled]:hover,
+a.disabled:hover,
+a:visited.disabled:hover,
+a:focus.disabled:hover {
+  text-decoration: none;
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css
new file mode 100644
index 00000000000..ea438a92337
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css
@@ -0,0 +1,18 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@font-face{font-family:Roboto;font-weight:400;font-style:normal;src:url(fonts/Roboto-Regular-webfont.eot);src:url(fonts/Roboto-Regular-webfont.eot?#iefix) format('embedded-opentype'),url(fonts/Roboto-Regular-webfont.woff) format('woff'),url(fonts/Roboto-Regular-webfont.ttf) format('truetype'),url(fonts/Roboto-Regular-webfont.svg#robotoregular) format('svg')}.font-mixin{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333}.btn,.btn:focus{outline:0;font-family:Roboto,sans-serif;text-transform:uppercase;height:34px;font-size:14px;padding:10px 20px;line-height:14px}.btn .glyphicon,.btn:focus .glyphicon{top:-1px;float:left}.box-shadow{box-shadow:0 0 2px 0 #1391c1}.btn-disabled{opacity:.6;box-shadow:none}.btn-default-disabled{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-default,.btn-default:focus{color:#666;background-color:#fff;border:1px solid #cfd3d7}.btn-default:focus:hover,.btn-default:hover{color:#fff;background-color:#808793}.btn-default:active,.btn-default:focus:active{color:#666;background-color:#fff;border:1px solid #cfd3d7;box-shadow:0 0 2px 0 #1391c1}.btn-default.disabled,.btn-default:focus.disabled,.btn-default:focus[disabled],.btn-default[disabled]{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-default.disabled.active,.btn-default.disabled:active,.btn-default.disabled:hover,.btn-default:focus.disabled.active,.btn-default:focus.disabled:active,.btn-default:focus.disabled:hover,.btn-default:focus[disabled].active,.btn-default:focus[disabled]:active,.btn-default:focus[disabled]:hover,.btn-default[disabled].active,.btn-default[disabled]:active,.btn-default[disabled]:hover{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-primary-disabled{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary,.btn-primary:focus{color:#fff;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary:focus:hover,.btn-primary:hover{color:#fff;background-color:#429929;border:1px solid #429929}.btn-primary.active,.btn-primary:active,.btn-primary:focus.active,.btn-primary:focus:active{color:#fff;background-color:#3fae2a;border:1px solid #3fae2a;box-shadow:0 0 2px 0 #1391c1}.btn-primary.disabled,.btn-primary:focus.disabled,.btn-primary:focus[disabled],.btn-primary[disabled]{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:hover,.btn-primary:focus.disabled.active,.btn-primary:focus.disabled:active,.btn-primary:focus.disabled:hover,.btn-primary:focus[disabled].active,.btn-primary:focus[disabled]:active,.btn-primary:focus[disabled]:hover,.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:hover{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-secondary-disabled{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-secondary,.btn-secondary:focus{color:#429929;background-color:#fff;border:1px solid #3fae2a}.btn-secondary:focus:hover,.btn-secondary:hover{color:#fff;background-color:#429929}.btn-secondary:active,.btn-secondary:focus:active{color:#429929;background-color:#fff;box-shadow:0 0 2px 0 #1391c1}.btn-secondary.disabled,.btn-secondary:focus.disabled,.btn-secondary:focus[disabled],.btn-secondary[disabled]{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:hover,.btn-secondary:focus.disabled.active,.btn-secondary:focus.disabled:active,.btn-secondary:focus.disabled:hover,.btn-secondary:focus[disabled].active,.btn-secondary:focus[disabled]:active,.btn-secondary:focus[disabled]:hover,.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:hover{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-success{border:none}.btn-regular-default-state{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-primary-default-state{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle,.dropdown.open .btn.dropdown-toggle{box-shadow:inset 0 0 3px 0 #1391c1}.btn-group.open .btn.dropdown-toggle,.btn-group.open .btn.dropdown-toggle.btn-default,.dropdown.open .btn.dropdown-toggle,.dropdown.open .btn.dropdown-toggle.btn-default{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .btn.dropdown-toggle.btn-default:hover,.btn-group.open .btn.dropdown-toggle:hover,.dropdown.open .btn.dropdown-toggle.btn-default:hover,.dropdown.open .btn.dropdown-toggle:hover{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .btn.dropdown-toggle+.dropdown-menu>li>a:hover,.btn-group.open .btn.dropdown-toggle.btn-default+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle.btn-default+.dropdown-menu>li>a:hover{background-color:#808793;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary,.dropdown.open .btn.dropdown-toggle.btn-primary{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary:hover,.dropdown.open .btn.dropdown-toggle.btn-primary:hover{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle.btn-primary+.dropdown-menu>li>a:hover{background-color:#429929;color:#fff}.btn-group.open .dropdown-menu,.dropdown.open .dropdown-menu{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;border-radius:2px;font-size:14px;min-width:200px;background:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .dropdown-menu>li,.dropdown.open .dropdown-menu>li{margin-bottom:1px}.btn-group.open .dropdown-menu>li>a,.dropdown.open .dropdown-menu>li>a{height:24px}.btn-group .btn.dropdown-toggle:first-child,.dropdown .btn.dropdown-toggle:first-child{min-width:80px}.btn-group .btn.dropdown-toggle.disabled,.btn-group .btn.dropdown-toggle[disabled],.dropdown .btn.dropdown-toggle.disabled,.dropdown .btn.dropdown-toggle[disabled]{opacity:.6}input.form-control{font-size:14px;border-radius:2px;color:#666;border:1px solid #cfd3d7;height:34px;padding:10px}input.form-control:focus{border-color:#1291c1;box-shadow:none}.help-block{color:#999;font-size:14px}.help-block.validation-block{color:#999;margin-top:10px}.help-block.validation-block::before{position:relative;top:2px;margin-right:5px;font-family:'Glyphicons Halflings'}.has-success input.form-control{color:#666;border:1px solid #1eb475}.has-success input.form-control:focus{border-color:#1eb475;box-shadow:none}.has-success .help-block.validation-block::before{content:'\e084';color:#1eb475}.has-error input.form-control{color:#666;border:1px solid #ef6162}.has-error input.form-control:focus{border-color:#ef6162;box-shadow:none}.has-error .help-block.validation-block::before{content:'\e083';color:#ef6162}.has-warning input.form-control{color:#666;border:1px solid #e98a40}.has-warning input.form-control:focus{border-color:#e98a40;box-shadow:none}.has-warning .help-block.validation-block::before{content:'\e101';color:#e98a40}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{color:#999;border-color:#ccc;background-color:#ddd}h2.table-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;margin-top:10px;font-size:20px}.table{color:#666;font-size:13px}.table tfoot,.table thead{color:#999}.table input[type=checkbox]+label{position:relative;line-height:1.3em;font-size:initial;top:4px;margin-bottom:0}.table thead>tr>th{border-bottom-color:#eee}.table tfoot>tr:first-of-type>td{border-top-width:2px;border-top-color:#eee}.table>tbody>tr>td{border-top-color:#eee}.table>tbody>tr.active{background-color:#eee}.table>tbody>tr.active>td{background-color:#eee}.table.table-hover .action{visibility:hidden;padding:0;line-height:1}.table.table-hover .action:hover{text-decoration:none}.table.table-hover>tbody>tr{border-width:0 1px 1px;border-style:solid;border-color:#eee transparent}.table.table-hover>tbody>tr>td{border-width:0}.table.table-hover>tbody>tr:hover{border-color:#a7dff2;background-color:#e7f6fc}.table.table-hover>tbody>tr:hover>td{border-top:1px solid #a7dff2;background-color:#e7f6fc}.table.table-hover>tbody>tr:hover>td .action{visibility:visible}.table.table-hover>tbody>tr:first-of-type>td{border-top:1px solid transparent}.table.table-hover>tbody>tr:first-of-type:hover>td{border-color:#a7dff2}.pagination-block .pagination-block-item{float:left;padding:0 5px}.pagination-block .pagination-block-item a,.pagination-block .pagination-block-item a:focus,.pagination-block .pagination-block-item a:visited{text-decoration:none}.pagination-block .pagination-block-item select{border:none;background-color:transparent;color:#1491c1}.nav.nav-tabs{border:none;margin-bottom:20px}.nav.nav-tabs li a{border-width:0;border-radius:0;border-bottom:2px solid transparent;color:#666;text-transform:uppercase}.nav.nav-tabs li a:active,.nav.nav-tabs li a:focus,.nav.nav-tabs li a:hover{color:#333;border-top-width:0;border-left-width:0;border-right-width:0;background:0 0}.nav.nav-tabs li a .badge.badge-important{display:inline}.nav.nav-tabs li.active a{color:#333;border-bottom:2px solid #3fae2a}.nav-tabs-left li,.nav-tabs-right li{float:none;margin-bottom:2px}.nav-tabs-left li a,.nav-tabs-right li a{margin-right:0}.nav-tabs-left li{margin-right:-1px}.nav-tabs-left li a{border:2px solid transparent!important}.nav-tabs-left li.active a,.nav-tabs-left li.active a:active,.nav-tabs-left li.active a:focus,.nav-tabs-left li.active a:hover{border-right:2px solid #3fae2a!important}.nav-tabs-right li{margin-left:-1px}.nav-tabs-right li a{border:2px solid transparent!important}.nav-tabs-right li.active a,.nav-tabs-right li.active a:active,.nav-tabs-right li.active a:focus,.nav-tabs-right li.active a:hover{border-left:2px solid #3fae2a!important}.wizard{border:2px solid #ebecf1}.wizard .wizard-header h3{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;font-size:20px;color:#333;margin:15px 20px}.wizard .wizard-body{overflow:hidden;margin:0}.wizard .wizard-body .wizard-content{background:#ebecf1;padding-top:25px;float:left;margin-bottom:-99999px;padding-bottom:99999px}.wizard .wizard-body .wizard-content .step-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-weight:700;font-size:18px;color:#666}.wizard .wizard-body .wizard-content .step-description{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;line-height:1.4;color:#999}.wizard .wizard-body .wizard-content .panel.panel-default{border:none;box-shadow:none;margin-top:20px}.wizard .wizard-body .wizard-content .panel.panel-default .panel-body{padding:30px 20px}.wizard .wizard-body .wizard-nav{min-height:550px;padding-top:25px;background-color:#323544;float:left;margin-bottom:-99999px;padding-bottom:99999px}.wizard .wizard-body .wizard-nav .nav li{padding:0 15px}.wizard .wizard-body .wizard-nav .nav li a{height:48px;padding:0 5px;display:table-cell;vertical-align:middle}.wizard .wizard-body .wizard-nav .nav li .step-marker{position:absolute;top:9px;line-height:16px;text-align:center;width:20px;height:20px;border:2px solid #1eb475;border-radius:50%;font-size:12px;font-style:inherit;color:#1eb475;background-color:#323544}.wizard .wizard-body .wizard-nav .nav li .step-name{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#999;margin-left:30px}.wizard .wizard-body .wizard-nav .nav li .step-index{line-height:18px}.wizard .wizard-body .wizard-nav .nav li .step-description{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:12px;color:#999;margin-left:30px}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker{background-color:#1eb475;color:#fff;font-size:10px;padding-left:2px}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index{display:none}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker:after{font-family:"Glyphicons Halflings";content:"\e013";position:relative;top:1px;left:-1px}.wizard .wizard-body .wizard-nav .nav li.completed:after{width:2px;height:100%;position:absolute;background-color:#1eb475;content:"";top:25px;left:29px}.wizard .wizard-body .wizard-nav .nav li.completed:last-child:after{content:none}.wizard .wizard-body .wizard-nav .nav li.active .step-name{font-weight:700}.wizard .wizard-body .wizard-nav .nav li.disabled .step-marker{color:#666;border-color:#666}.wizard .wizard-body .wizard-nav .nav li.disabled .step-description,.wizard .wizard-body .wizard-nav .nav li.disabled .step-name{color:#666}.wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker{background-color:#1eb475;border:2px solid #1eb475;color:#fff}.wizard .wizard-body .wizard-nav .nav-pills>li.active>a,.wizard .wizard-body .wizard-nav .nav-pills>li.active>a:focus,.wizard .wizard-body .wizard-nav .nav-pills>li.active>a:hover,.wizard .wizard-body .wizard-nav .nav>li>a:focus,.wizard .wizard-body .wizard-nav .nav>li>a:hover{background-color:inherit}.wizard .wizard-body .wizard-footer{background:#fff;padding:15px 20px}.wizard .wizard-body .wizard-footer button{margin:0 10px}.checkbox-disabled-style{background-color:#b2b8c1;border-color:#b2b8c1}input[type=checkbox]:checked,input[type=checkbox]:not(:checked),input[type=radio]:checked,input[type=radio]:not(:checked){display:none}input[type=checkbox]:checked+label,input[type=checkbox]:not(:checked)+label,input[type=radio]:checked+label,input[type=radio]:not(:checked)+label{position:relative;padding-left:20px}input[type=checkbox]:checked+label:hover:before,input[type=checkbox]:not(:checked)+label:hover:before,input[type=radio]:checked+label:hover:before,input[type=radio]:not(:checked)+label:hover:before{border-color:#1491c1;background-color:#1491c1}input[type=checkbox]:checked+label:before,input[type=radio]:checked+label:before{background-color:#1491c1;border-color:#1491c1}input[type=checkbox].disabled+label:before,input[type=checkbox].disabled+label:hover:before,input[type=checkbox][disabled]+label:before,input[type=checkbox][disabled]+label:hover:before,input[type=radio].disabled+label:before,input[type=radio].disabled+label:hover:before,input[type=radio][disabled]+label:before,input[type=radio][disabled]+label:hover:before{background-color:#b2b8c1;border-color:#b2b8c1}input[type=checkbox]+label:before{content:'';position:absolute;left:0;top:4px;width:10px;height:10px;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:2px;border-width:1px;border-style:solid;border-color:#ddd}input[type=checkbox]:checked+label:after{content:'\2714';color:#fff;position:absolute;top:0;left:2px;font-size:9px}input.radio+label:before,input[type=radio]+label:before{content:'';position:absolute;left:0;top:0;width:12px;height:12px;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:12px;border-width:1px;border-style:solid;border-color:#ddd}input.radio:checked+label:after,input[type=radio]:checked+label:after{content:'';background-color:#fff;position:absolute;top:3px;left:3px;width:6px;height:6px;border-radius:6px}.navigation-bar-container{height:auto;width:230px;background-color:#323544;padding:0;-ms-overflow-style:none;transition:width .5s ease-out;-webkit-font-smoothing:antialiased}.navigation-bar-container ul.nav.side-nav-header{width:230px;transition:width .5s ease-out}.navigation-bar-container ul.nav.side-nav-header li.navigation-header{background:#313d54;padding:15px 5px 15px 25px;height:55px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header>a.ambari-logo{padding:0}.navigation-bar-container ul.nav.side-nav-header li.navigation-header>a.ambari-logo>img{height:25px;float:left;margin-left:-3px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group{cursor:pointer;margin-top:3px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.ambari-header,.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.ambari-header{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:20px;width:55px;display:inline;color:#b8bec4;padding:0 8px 0 10px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.toggle-icon{margin-bottom:5px;font-size:13px;display:inline-block;vertical-align:middle;color:#b8bec4}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group.open .dropdown-toggle{box-shadow:none}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu{top:30px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li>a{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#666;line-height:1.42;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li>a:hover{background:#f5f5f5}.navigation-bar-container ul.nav.side-nav-footer,.navigation-bar-container ul.nav.side-nav-menu{background-color:#323544;width:230px;transition:width .5s ease-out}.navigation-bar-container ul.nav.side-nav-footer li,.navigation-bar-container ul.nav.side-nav-menu li{padding:0;margin:0}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a{display:table-cell;vertical-align:middle;width:230px;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;white-space:nowrap}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .navigation-menu-item{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#b8bec4;padding-left:8px}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .navigation-icon{line-height:18px;font-size:18px;color:#b8bec4}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .toggle-icon{line-height:14px;font-size:14px;color:#b8bec4;padding:3px 5px 3px 10px}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a{padding:10px 5px 10px 20px}.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a{padding:10px 5px 10px 25px}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer{background:#313d54;height:50px}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon{color:#31823a;font-size:20px;position:relative;padding:0 15px;left:calc(30%)}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon:hover,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon:hover{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li>ul>li,.navigation-bar-container ul.nav.side-nav-menu li>ul>li{background-color:#323544}.navigation-bar-container ul.nav.side-nav-footer li>ul>li a,.navigation-bar-container ul.nav.side-nav-menu li>ul>li a{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#999}.navigation-bar-container ul.nav.side-nav-footer li>ul>li a .submenu-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li a .submenu-icon{line-height:14px;font-size:14px}.navigation-bar-container ul.nav.side-nav-footer li>a:hover,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover,.navigation-bar-container ul.nav.side-nav-menu li>a:hover,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover{background:#404351;cursor:pointer;color:#fff}.navigation-bar-container ul.nav.side-nav-footer li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu),.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu){background:#404351;cursor:pointer}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a:after,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a:after,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a:after,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a:after{left:0;top:50%;border:solid transparent;border-width:10px 7px;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:transparent;border-left-color:#31823a;margin-top:-12px}.navigation-bar-container ul.nav.side-nav-footer .more-actions,.navigation-bar-container ul.nav.side-nav-menu .more-actions{display:none;position:absolute;top:14px;right:33px;line-height:25px;width:20px;text-align:center;font-size:14px;cursor:pointer;vertical-align:middle;color:#fff}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a{color:#666}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a i,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a i{color:#666}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a:hover,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a:hover{background:#f5f5f5}.navigation-bar-container ul.nav.side-nav-footer .menu-item-name,.navigation-bar-container ul.nav.side-nav-menu .menu-item-name{display:inline-block;vertical-align:bottom;max-width:100px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;-ms-text-overflow:ellipsis;white-space:nowrap}.navigation-bar-container .nav-pills>li.active>a,.navigation-bar-container .nav-pills>li.active>a:focus,.navigation-bar-container .nav-pills>li.active>a:hover,.navigation-bar-container .nav>li>a:focus,.navigation-bar-container .nav>li>a:hover{background-color:inherit}.navigation-bar-container.collapsed{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-header{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header{padding:15px 0 15px 15px}.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header .dropdown-menu,.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.ambari-header,.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.toggle-icon{display:none}.navigation-bar-container.collapsed ul.nav.side-nav-footer,.navigation-bar-container.collapsed ul.nav.side-nav-menu{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a{padding:15px 0 15px 15px;width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .toggle-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .toggle-icon{display:none}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.navigation-footer a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.navigation-footer a .navigation-icon{padding:0 5px;left:0}.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu,.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.sub-menu{display:none;width:230px;position:absolute;z-index:100;top:0;left:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li>a{padding:10px 5px 10px 25px;width:230px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active{background:#404351;cursor:pointer}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a{color:#fff}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .submenu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .toggle-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .submenu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .toggle-icon{color:#fff}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a:after,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a:after{left:0;top:50%;border:solid transparent;border-width:12px 6px;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:transparent;border-left-color:#31823a;margin-top:-12px}.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions,.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions{display:none}.navigation-bar-fit-height{position:fixed;top:0;bottom:0;left:0;z-index:2079}.navigation-bar-fit-height .side-nav-header{position:absolute;top:0}.navigation-bar-fit-height .side-nav-menu{position:absolute;top:55px;bottom:50px}.navigation-bar-fit-height .side-nav-footer{position:absolute;bottom:0}.navigation-bar-fit-height .more-actions .dropdown-menu{position:fixed;top:auto;left:auto}.navigation-bar-fit-height .navigation-bar-container{height:100%}.navigation-bar-fit-height .navigation-bar-container .side-nav-menu{overflow-y:auto}.notifications-group{position:relative;top:1px}#notifications-dropdown.dropdown-menu{min-width:300px;max-width:300px;min-height:150px;padding:0;z-index:1000;right:-50px;left:auto;top:260%;border:none;box-shadow:0 2px 10px 2px rgba(0,0,0,.29)}#notifications-dropdown.dropdown-menu .popup-arrow-up{position:absolute;right:37px;top:-40px;width:40px;height:40px;overflow:hidden}#notifications-dropdown.dropdown-menu .popup-arrow-up:after{content:"";position:absolute;width:20px;height:20px;background:#fff;-ms-transform:rotate(45deg);transform:rotate(45deg);top:30px;left:10px;box-shadow:-1px -1px 10px -2px rgba(0,0,0,.5)}#notifications-dropdown.dropdown-menu .notifications-header{border-bottom:1px solid #eee;padding:15px 20px}#notifications-dropdown.dropdown-menu .notifications-header .notifications-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:16px}#notifications-dropdown.dropdown-menu .notifications-body{padding:0 15px;overflow:auto;max-height:500px}#notifications-dropdown.dropdown-menu .notifications-body .no-alert-text{padding:15px 5px}#notifications-dropdown.dropdown-menu .notifications-body .table-controls{padding:10px 0;margin:0;border-bottom:1px solid #eee}#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter{padding:0;font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:12px;color:#666;position:relative}#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter .form-control.filter-select{font-size:12px;color:#666;height:25px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table{margin-top:0}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr{cursor:pointer}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover{cursor:default;border-color:transparent;border-bottom-color:#eee}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover>td{border-color:transparent;background-color:#fff}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status{width:9%;padding:15px 3px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-CRITICAL{color:#ef6162}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-WARNING{color:#e98a40}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content{width:90%;padding:15px 3px 10px 3px;font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;line-height:1.3}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .name{font-weight:700;font-size:14px;color:#333;margin-bottom:5px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .description{font-size:12px;color:#666;margin-bottom:4px;display:block;display:-webkit-box;-webkit-line-clamp:3;max-height:47px;overflow:hidden;text-overflow:ellipsis;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .timestamp{text-align:right;font-size:11px;color:#999}#notifications-dropdown.dropdown-menu .notifications-footer{border-top:1px solid #eee;padding:15px}.modal-backdrop{background-color:grey}.modal .modal-content{border-radius:2px}.modal .modal-content .modal-body,.modal .modal-content .modal-footer,.modal .modal-content .modal-header{padding-left:20px;padding-right:20px}.modal .modal-content .modal-header{border-bottom:none;padding-top:20px;color:#666;font-size:20px}.modal .modal-content .modal-header h4{margin:0;color:inherit;font-size:inherit}.modal .modal-content .modal-body{color:#666;font-size:12px}.modal .modal-content .modal-footer{border-top:none;padding-bottom:20px}.modal .modal-content .modal-footer .btn~.btn{margin-left:10px}.accordion .panel-group,.wizard .wizard-body .wizard-content .accordion .panel-group{margin-bottom:0}.accordion .panel-group .panel,.wizard .wizard-body .wizard-content .accordion .panel-group .panel{border-radius:0;border:none;margin-top:0}.accordion .panel-group .panel .panel-heading,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading{height:50px;padding:15px 10px;border:1px solid;border-color:#ddd transparent;border-top:none;background:#fff}.accordion .panel-group .panel .panel-heading .panel-title,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333}.accordion .panel-group .panel .panel-heading .panel-title>a,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title>a{font-size:18px;color:#333}.accordion .panel-group .panel .panel-heading .panel-title>i,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title>i{font-size:20px;color:#1491c1}.accordion .panel-group .panel .panel-heading:hover,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading:hover{background:#f3faff;cursor:pointer}.accordion .panel-group .panel .panel-body,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-body{padding:15px 10px 20px 20px}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:Roboto,sans-serif}.h1,h1{font-size:24px}.h2,h2{font-size:18px}.body,body{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px}.description{font-family:Roboto,sans-serif;font-size:12px;color:#000}a,a:focus,a:visited{color:#1491c1;text-decoration:none}a:focus:hover,a:hover,a:visited:hover{text-decoration:underline}a:active,a:focus:active,a:visited:active{text-decoration:none}a.disabled,a:focus.disabled,a:focus[disabled],a:visited.disabled,a:visited[disabled],a[disabled]{cursor:not-allowed;color:#666;text-decoration:none}a.disabled:hover,a:focus.disabled:hover,a:focus[disabled]:hover,a:visited.disabled:hover,a:visited[disabled]:hover,a[disabled]:hover{text-decoration:none}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.eot b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.eot
new file mode 100644
index 00000000000..d4e185d153a
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.eot differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.svg b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.svg
new file mode 100644
index 00000000000..eea0b2de36f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.svg
@@ -0,0 +1,7606 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="robotoregular" horiz-adv-x="1164" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="509" />
+<glyph unicode="fi" horiz-adv-x="1140" d="M28 936v146h170v117q0 182 106.5 282t295.5 100q67 0 132 -15.5t153 -45.5l-34 -160q-53 21 -113 36t-123 15q-117 0 -168.5 -52t-51.5 -160v-117h215v-146h-215v-936h-197v936h-170zM783 0v1082h198v-1082h-198z" />
+<glyph unicode=" "  horiz-adv-x="509" />
+<glyph unicode="&#x09;" horiz-adv-x="509" />
+<glyph unicode="&#xa0;" horiz-adv-x="509" />
+<glyph unicode="!" horiz-adv-x="539" d="M171 0v204h198v-204h-198zM171 478v978h197v-978h-197z" />
+<glyph unicode="&#x22;" horiz-adv-x="668" d="M80 1040l1 240v280h197v-270l-101 -250h-97zM389 1040l1 248v272h197v-270l-101 -250h-97z" />
+<glyph unicode="#" horiz-adv-x="1276" d="M70 410v140h264l68 348h-256v142h284l82 416h151l-82 -416h255l82 416h151l-82 -416h199v-142h-226l-68 -348h219v-140h-247l-80 -410h-152l80 410h-255l-80 -410h-151l80 410h-236zM485 550h255l68 348h-255z" />
+<glyph unicode="$" horiz-adv-x="1153" d="M114 424l2 5h190q0 -154 77.5 -219.5t190.5 -65.5q129 0 201.5 61.5t72.5 170.5q0 89 -64 153t-210 114q-202 61 -305 163t-103 272q0 165 94.5 269t260.5 125v221h158v-222q168 -24 260.5 -143.5t92.5 -320.5h-196q0 136 -63 220t-175 84q-118 0 -176.5 -61.5 t-58.5 -168.5q0 -97 60.5 -157t218.5 -114q205 -66 304 -164.5t99 -267.5q0 -172 -103 -273.5t-283 -120.5v-192h-157v191q-172 18 -282 125.5t-106 315.5z" />
+<glyph unicode="%" horiz-adv-x="1498" d="M104 1099v77q0 127 82 214t219 87t219 -86.5t82 -214.5v-77q0 -127 -81.5 -213t-217.5 -86q-138 0 -220.5 86t-82.5 213zM250 1099q0 -74 40.5 -125.5t116.5 -51.5q73 0 113 51t40 126v77q0 74 -40.5 126.5t-114.5 52.5q-75 0 -115 -52.5t-40 -126.5v-77zM349 177 l711 1138l109 -67l-711 -1138zM809 279v78q0 127 82 213.5t219 86.5q136 0 218.5 -86.5t82.5 -213.5v-78q0 -128 -82 -214t-217 -86q-138 0 -220.5 86t-82.5 214zM955 279q0 -75 40.5 -126.5t116.5 -51.5q73 0 113 51.5t40 126.5v78q0 74 -41 126t-114 52q-74 0 -114.5 -52 t-40.5 -126v-78z" />
+<glyph unicode="&#x26;" horiz-adv-x="1276" d="M64 392q0 122 70.5 213.5t210.5 183.5q-78 99 -116 176.5t-38 159.5q0 169 97.5 260.5t268.5 91.5q158 0 257 -91t99 -219q0 -98 -52.5 -169.5t-155.5 -146.5l-109 -80l340 -409q41 65 64 144t23 167h176q0 -132 -39 -244t-113 -201l185 -223l-2 -5h-229l-85 102 q-80 -60 -177 -91.5t-201 -31.5q-217 0 -345.5 115t-128.5 298zM261 392q0 -113 71 -186t206 -73q72 0 142 24.5t132 70.5l-361 435l-40 -29q-91 -68 -120.5 -130t-29.5 -112zM388 1127q0 -53 27 -110.5t81 -125.5l138 95q57 38 77.5 82.5t20.5 98.5q0 61 -48.5 108 t-126.5 47q-81 0 -125 -56.5t-44 -138.5z" />
+<glyph unicode="'" horiz-adv-x="359" d="M80 1055l1 265v240h197v-223l-101 -282h-97z" />
+<glyph unicode="(" horiz-adv-x="679" d="M132 582v9q0 394 159 673t334 372l6 -1l38 -116q-137 -107 -238.5 -343t-101.5 -583v-13q0 -347 101 -583t239 -352l-38 -108h-6q-175 93 -334 371.5t-159 673.5z" />
+<glyph unicode=")" horiz-adv-x="687" d="M6 -355q135 105 237.5 345.5t102.5 589.5v13q0 342 -105.5 583.5t-234.5 351.5l38 108h6q174 -93 333.5 -372t159.5 -673v-9q0 -395 -159.5 -673.5t-333.5 -371.5h-6z" />
+<glyph unicode="*" horiz-adv-x="884" d="M28 1071l49 154l296 -111l-10 342h161l-10 -348l293 110l48 -156l-302 -89l193 -270l-131 -96l-181 287l-176 -279l-132 93l198 274z" />
+<glyph unicode="+" horiz-adv-x="1162" d="M78 605v178h402v423h197v-423h399v-178h-399v-459h-197v459h-402z" />
+<glyph unicode="," horiz-adv-x="404" d="M48 -258l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="-" horiz-adv-x="561" d="M35 538v154h490v-154h-490z" />
+<glyph unicode="." horiz-adv-x="548" d="M161 0v202h197v-202h-197z" />
+<glyph unicode="/" horiz-adv-x="850" d="M16 -125l608 1581h167l-607 -1581h-168z" />
+<glyph unicode="0" horiz-adv-x="1154" d="M113 555v345q0 278 124.5 427.5t338.5 149.5q215 0 339.5 -149.5t124.5 -427.5v-345q0 -279 -123.5 -427.5t-338.5 -148.5t-340 149t-125 427zM310 515q0 -189 69 -285.5t199 -96.5t197.5 96t67.5 286v427q0 189 -68.5 284.5t-198.5 95.5t-198 -95.5t-68 -284.5v-427z " />
+<glyph unicode="1" horiz-adv-x="1153" d="M186 1260v142l495 54v-1456h-197v1264z" />
+<glyph unicode="2" horiz-adv-x="1153" d="M97 1033q-5 188 125 316t360 128q196 0 312.5 -114.5t116.5 -291.5q0 -119 -70.5 -238.5t-197.5 -256.5l-383 -417l2 -5h700v-154h-944v135l477 530q128 143 173.5 227t45.5 172q0 109 -63.5 183.5t-168.5 74.5q-151 0 -222.5 -77.5t-71.5 -217.5h-189z" />
+<glyph unicode="3" horiz-adv-x="1153" d="M100 378l3 6h188q0 -115 70.5 -183t193.5 -68q125 0 196 68t71 201q0 135 -63 199t-199 64h-172v154h172q131 0 185.5 65.5t54.5 182.5q0 125 -62 190t-183 65q-115 0 -184.5 -67.5t-69.5 -179.5h-189l-2 6q-5 165 119.5 280.5t325.5 115.5q202 0 322 -107.5t120 -306.5 q0 -90 -54.5 -179.5t-163.5 -136.5q131 -43 185.5 -135t54.5 -206q0 -199 -130.5 -313t-333.5 -114q-199 0 -329.5 107.5t-125.5 291.5z" />
+<glyph unicode="4" horiz-adv-x="1153" d="M55 336v111l642 1009h208v-966h201v-154h-201v-336h-196v336h-654zM265 490h444v683l-6 1l-19 -50z" />
+<glyph unicode="5" horiz-adv-x="1153" d="M157 377l2 6h178q0 -119 68.5 -184.5t177.5 -65.5q125 0 194 88t69 241q0 140 -70 230t-193 90q-116 0 -168 -35t-76 -107l-164 17l84 799h729v-175h-562l-48 -409q46 34 102.5 56.5t130.5 24.5q201 2 316.5 -131t115.5 -358q0 -219 -117.5 -352t-342.5 -133 q-185 0 -308 101t-118 297z" />
+<glyph unicode="6" horiz-adv-x="1153" d="M132 571v278q0 280 156 454t387 174q75 0 148.5 -17t121.5 -43l-42 -151q-49 25 -102.5 40.5t-125.5 15.5q-156 0 -251.5 -125t-95.5 -326v-23q64 56 146.5 87.5t177.5 31.5q195 0 311 -135t116 -342q0 -226 -123.5 -368.5t-329.5 -142.5q-214 0 -354 155t-140 437z M328 552q0 -201 85 -310t213 -109q121 0 188.5 102.5t67.5 254.5q0 144 -72.5 237t-201.5 93q-101 0 -172 -41t-108 -109v-118z" />
+<glyph unicode="7" horiz-adv-x="1153" d="M77 1301v155h985v-155q-264 -314 -356.5 -556.5t-133.5 -587.5l-16 -157h-197l16 157q42 344 163 615t331 529h-792z" />
+<glyph unicode="8" horiz-adv-x="1153" d="M102 394q0 123 74 217t200 138q-109 42 -171 127.5t-62 199.5q0 192 118.5 296.5t313.5 104.5q192 0 313.5 -104.5t121.5 -296.5q0 -114 -64 -199.5t-173 -127.5q126 -44 201.5 -138t75.5 -217q0 -202 -131.5 -308.5t-341.5 -106.5q-214 0 -344.5 106.5t-130.5 308.5z M299 398q0 -124 76 -194.5t202 -70.5q123 0 200 71t77 194q0 120 -79 197t-200 77q-123 0 -199.5 -77t-76.5 -197zM340 1072q0 -111 65.5 -178t171.5 -67q104 0 170 67t66 178q0 108 -67.5 179t-170.5 71q-105 0 -170 -68.5t-65 -181.5z" />
+<glyph unicode="9" horiz-adv-x="1153" d="M83 978q0 219 131.5 359t319.5 140q228 0 359.5 -142.5t131.5 -419.5v-347q0 -285 -142.5 -437t-371.5 -152q-77 0 -156.5 14.5t-142.5 44.5l30 151q59 -31 122.5 -43.5t146.5 -12.5q144 0 230.5 109t86.5 324v66q-49 -71 -122.5 -107.5t-163.5 -36.5q-211 0 -335 130.5 t-124 359.5zM280 978q0 -150 70.5 -243t191.5 -93q109 0 181.5 47t104.5 120v126q0 191 -73.5 289t-214.5 98q-108 0 -184 -96.5t-76 -247.5z" />
+<glyph unicode=":" horiz-adv-x="517" d="M161 0v202h197v-202h-197zM161 876v202h197v-202h-197z" />
+<glyph unicode=";" horiz-adv-x="525" d="M99 -258l70 316v163h197v-173l-150 -306h-117zM162 876v202h197v-202h-197z" />
+<glyph unicode="&#x3c;" horiz-adv-x="1040" d="M71 466v149l816 378v-201l-559 -233l-85 -18v-6l85 -19l559 -228v-201z" />
+<glyph unicode="=" horiz-adv-x="1153" d="M152 407v164h834v-164h-834zM152 823v164h834v-164h-834z" />
+<glyph unicode="&#x3e;" horiz-adv-x="1072" d="M136 87v196l598 238l85 17v6l-85 20l-598 234v195l856 -378v-149z" />
+<glyph unicode="?" horiz-adv-x="974" d="M61 1122q-3 161 113.5 258t296.5 97q197 0 306 -100.5t109 -280.5q0 -129 -70.5 -236t-186.5 -219q-54 -54 -65.5 -97t-11.5 -134h-197q1 145 25 201t126 148q99 117 141 180t42 152q0 106 -56.5 163t-161.5 57q-91 0 -155 -49.5t-64 -145.5h-188zM353 0v208h206v-208 h-206z" />
+<glyph unicode="@" horiz-adv-x="1833" d="M114 478q19 423 249 688t602 265q379 0 581.5 -250t185.5 -679q-9 -214 -120 -368.5t-332 -154.5q-73 0 -126 41.5t-76 117.5q-50 -80 -122 -119.5t-168 -39.5q-125 0 -194 120.5t-51 316.5q23 259 137.5 415.5t279.5 156.5q105 0 169 -26t139 -80l-4 -4h6l-51 -585 q-9 -110 21.5 -151.5t81.5 -41.5q123 0 197 113.5t82 288.5q16 382 -144 595.5t-496 213.5q-308 0 -495.5 -231t-202.5 -602q-18 -376 150 -594.5t482 -218.5q88 0 178.5 21.5t152.5 56.5l38 -107q-67 -42 -170.5 -65.5t-202.5 -23.5q-380 0 -587.5 249.5t-189.5 681.5z M720 416q-11 -142 21.5 -216t106.5 -74q64 0 117 24.5t97 87.5q-1 12 -0.5 25.5t2.5 29.5l47 538q-26 12 -54.5 19t-59.5 7q-125 0 -191 -109.5t-86 -331.5z" />
+<glyph unicode="A" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6z" />
+<glyph unicode="B" horiz-adv-x="1309" d="M180 0v1456h475q228 0 357 -98.5t129 -295.5q0 -97 -62 -173.5t-163 -113.5q132 -28 207.5 -129t75.5 -235q0 -200 -129.5 -305.5t-351.5 -105.5h-538zM377 154h341q134 0 209 66.5t75 188.5q0 128 -62.5 201t-192.5 73h-370v-529zM377 837h319q110 0 179 60.5t69 168.5 q0 118 -74.5 176.5t-214.5 58.5h-278v-464z" />
+<glyph unicode="C" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5q247 1 393 -131q142 -128 142 -337v-12l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6v-11q0 -198 -144 -332q-148 -138 -391 -138 q-247 0 -402.5 175t-155.5 444z" />
+<glyph unicode="D" horiz-adv-x="1349" d="M180 0v1456h447q286 0 459 -175.5t173 -453.5v-199q0 -279 -173 -453.5t-459 -174.5h-447zM377 154h250q202 0 318.5 133t116.5 341v201q0 206 -116.5 339t-318.5 133h-250v-1147z" />
+<glyph unicode="E" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966z" />
+<glyph unicode="F" horiz-adv-x="1193" d="M180 0v1456h963v-155h-766v-502h664v-155h-664v-644h-197z" />
+<glyph unicode="G" horiz-adv-x="1396" d="M120 578v300q0 265 159 432t410 167q250 0 393 -123t146 -317l-2 -6h-188q-9 127 -96.5 209t-252.5 82q-167 0 -269 -125t-102 -317v-302q0 -194 114 -319.5t290 -125.5q124 0 203 33t113 75v331h-319v155h516v-534q-52 -80 -180.5 -147t-332.5 -67q-261 0 -431.5 167 t-170.5 432z" />
+<glyph unicode="H" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197z" />
+<glyph unicode="I" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
+<glyph unicode="J" horiz-adv-x="1130" d="M66 395l2 6h189q0 -135 68.5 -201.5t193.5 -66.5q109 0 178 73.5t69 196.5v1053h197v-1053q0 -195 -123.5 -309.5t-320.5 -114.5q-210 0 -334 107q-119 102 -119 293v16z" />
+<glyph unicode="K" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197z" />
+<glyph unicode="L" horiz-adv-x="1106" d="M180 0v1456h197v-1302h689v-154h-886z" />
+<glyph unicode="M" horiz-adv-x="1799" d="M180 0v1456h252l464 -1183h6l464 1183h252v-1456h-197v576l20 592l-5 1l-472 -1169h-131l-470 1166l-5 -1l19 -589v-576h-197z" />
+<glyph unicode="N" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197z" />
+<glyph unicode="O" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261z" />
+<glyph unicode="P" horiz-adv-x="1312" d="M180 0v1456h557q233 0 362 -120t129 -316q0 -199 -129 -317.5t-362 -118.5h-360v-584h-197zM377 738h360q148 0 221 79.5t73 200.5t-73.5 202t-220.5 81h-360v-563z" />
+<glyph unicode="Q" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -142 -50 -263t-140 -205l247 -233l-135 -129l-276 257q-56 -23 -116.5 -34.5t-124.5 -11.5q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5 t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
+<glyph unicode="R" horiz-adv-x="1357" d="M180 0v1455h527q239 0 365 -106t126 -308q0 -112 -58.5 -195t-170.5 -132q120 -39 172.5 -126.5t52.5 -216.5v-137q0 -68 15 -122t52 -88v-24h-203q-39 34 -50 100t-11 136v133q0 118 -69 190t-185 72h-366v-631h-197zM377 786h310q167 0 240.5 63.5t73.5 193.5 q0 123 -71.5 190.5t-222.5 67.5h-330v-515z" />
+<glyph unicode="S" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 381 -131q137 -127 136 -292v-12l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -386 118q-163 115 -162 305v11z" />
+<glyph unicode="T" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467z" />
+<glyph unicode="U" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5z" />
+<glyph unicode="V" horiz-adv-x="1295" d="M22 1456h214l376 -1094l33 -115h6l33 115l376 1094h213l-541 -1456h-169z" />
+<glyph unicode="W" horiz-adv-x="1809" d="M54 1456h196l222 -952l27 -182l6 -1l39 183l267 952h174l269 -952l40 -187h6l29 187l217 952h197l-351 -1456h-176l-287 1010l-26 131h-6l-25 -131l-292 -1010h-176z" />
+<glyph unicode="X" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238z" />
+<glyph unicode="Y" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525z" />
+<glyph unicode="Z" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036z" />
+<glyph unicode="[" horiz-adv-x="552" d="M143 -312v1976h385v-155h-188v-1666h188v-155h-385z" />
+<glyph unicode="\" horiz-adv-x="846" d="M39 1456h186l608 -1581h-186z" />
+<glyph unicode="]" horiz-adv-x="552" d="M11 -157h189v1666h-189v155h386v-1976h-386v155z" />
+<glyph unicode="^" horiz-adv-x="856" d="M61 729l299 727h134l298 -727h-181l-166 419l-16 70h-6l-16 -70l-163 -419h-183z" />
+<glyph unicode="_" horiz-adv-x="931" d="M4 0h923v-154h-923v154z" />
+<glyph unicode="`" horiz-adv-x="641" d="M82 1471l3 6h230l175 -266h-158z" />
+<glyph unicode="a" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6v11q0 111 112 205q118 98 303 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="b" d="M143 0v1560h197v-606q51 72 126.5 110t176.5 38q200 0 312 -160t112 -421v-21q0 -234 -112.5 -377.5t-309.5 -143.5q-107 0 -186 41.5t-131 122.5l-24 -143h-161zM340 309q38 -80 99.5 -125t155.5 -45q139 0 207 99t68 262v21q0 186 -68.5 303.5t-208.5 117.5 q-91 0 -153.5 -44.5t-99.5 -119.5v-469z" />
+<glyph unicode="c" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q191 0 311 -112q117 -108 116 -265v-10l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6v-10q-1 -134 -125 -238 q-130 -108 -301 -109q-236 0 -361 154t-125 387z" />
+<glyph unicode="d" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v595h197v-1560h-161l-23 133q-53 -76 -130 -115t-179 -39q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q88 0 148 40t98 112v505q-38 67 -98.5 106.5t-145.5 39.5 q-142 0 -209.5 -117t-67.5 -304v-21z" />
+<glyph unicode="e" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="f" horiz-adv-x="707" d="M56 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h225v-146h-225v-936h-197v936h-169z" />
+<glyph unicode="g" d="M100 500v21q0 261 114 421t315 160q103 0 181 -41.5t130 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l50 153q53 -30 128 -48.5t148 -18.5q144 0 209.5 65.5t65.5 199.5v122q-53 -68 -127 -102.5t-170 -34.5q-199 0 -313 144 t-114 377zM297 500q0 -163 69 -262t210 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -211 -118t-70 -303v-21z" />
+<glyph unicode="h" d="M143 0v1560h197v-623q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-678h-197v680q0 134 -57.5 198t-171.5 64q-82 0 -148.5 -38.5t-109.5 -104.5v-799h-197z" />
+<glyph unicode="i" horiz-adv-x="516" d="M159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197z" />
+<glyph unicode="j" horiz-adv-x="530" d="M-66 -419l14 155q14 -5 40 -8.5t43 -3.5q65 0 103.5 44t38.5 143v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM167 1363v197h197v-197h-197z" />
+<glyph unicode="k" horiz-adv-x="1050" d="M144 0v1560h197v-904h126l296 426h236l-370 -492l423 -590h-232l-351 499h-128v-499h-197z" />
+<glyph unicode="l" horiz-adv-x="516" d="M159 0v1560h197v-1560h-197z" />
+<glyph unicode="m" horiz-adv-x="1790" d="M143 0v1082h176l14 -142q53 77 134.5 119.5t189.5 42.5t185.5 -50t116.5 -150q51 92 135 146t196 54q165 0 261 -113.5t96 -341.5v-647h-197v649q0 160 -55 226.5t-164 66.5q-101 0 -163.5 -70t-73.5 -177v-8v-687h-198v649q0 152 -56.5 222.5t-162.5 70.5 q-90 0 -148 -37t-89 -104v-801h-197z" />
+<glyph unicode="n" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197z" />
+<glyph unicode="o" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="p" d="M143 -416v1498h151l31 -140q53 78 132 119t184 41q201 0 312.5 -159.5t111.5 -421.5v-21q0 -234 -112 -377.5t-309 -143.5q-100 0 -175.5 33.5t-128.5 100.5v-529h-197zM340 275q37 -67 97 -104.5t147 -37.5q140 0 212 102.5t72 264.5v21q0 184 -72.5 302.5t-213.5 118.5 q-85 0 -145 -38.5t-97 -105.5v-523z" />
+<glyph unicode="q" d="M98 500v21q0 261 111.5 421t312.5 160q99 0 174 -37.5t127 -109.5l29 127h150v-1498h-197v518q-52 -61 -123 -92t-162 -31q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67.5 -265.5t207.5 -101.5q81 0 138.5 36t96.5 101v546q-39 61 -96.5 96t-136.5 35 q-141 0 -209 -119.5t-68 -306.5v-21z" />
+<glyph unicode="r" horiz-adv-x="702" d="M143 0v1082h176l19 -158q46 84 113.5 131t155.5 47q22 0 42 -3.5t33 -7.5l-27 -183l-101 6q-78 0 -131.5 -37t-82.5 -104v-773h-197z" />
+<glyph unicode="s" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 301 -97q107 -93 106 -224v-12l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105q-113 100 -113 232v13z" />
+<glyph unicode="t" horiz-adv-x="708" d="M34 936v146h172v261h197v-261h205v-146h-205v-657q0 -76 31.5 -107t83.5 -31q17 0 37.5 4t36.5 10l26 -135q-22 -18 -64.5 -29.5t-85.5 -11.5q-120 0 -191 72.5t-71 227.5v657h-172z" />
+<glyph unicode="u" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352z" />
+<glyph unicode="v" horiz-adv-x="1030" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-398 -1082h-149z" />
+<glyph unicode="w" horiz-adv-x="1550" d="M45 1082h196l179 -688l23 -131h6l28 131l216 688h158l217 -688l31 -146h6l29 146l170 688h196l-314 -1082h-159l-209 659l-45 184l-6 -1l-43 -183l-206 -659h-159z" />
+<glyph unicode="x" horiz-adv-x="1030" d="M46 0l361 547l-351 535h227l227 -399l230 399h230l-351 -535l361 -547h-226l-240 409l-240 -409h-228z" />
+<glyph unicode="y" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113z" />
+<glyph unicode="z" horiz-adv-x="1030" d="M94 0v138l585 788h-578v156h819v-134l-591 -794h625v-154h-860z" />
+<glyph unicode="{" horiz-adv-x="696" d="M63 543v147q106 0 157.5 61.5t51.5 174.5v206q0 171 82 290.5t277 174.5l40 -117q-110 -35 -156 -125.5t-46 -222.5v-206q0 -105 -42.5 -185t-127.5 -125q85 -46 127.5 -126.5t42.5 -183.5v-205q0 -132 46 -221.5t156 -125.5l-40 -118q-195 55 -277 175t-82 290v205 q0 112 -51.5 174.5t-157.5 62.5z" />
+<glyph unicode="|" horiz-adv-x="507" d="M175 -270v1726h158v-1726h-158z" />
+<glyph unicode="}" horiz-adv-x="696" d="M21 -246q109 36 156 125.5t47 221.5v205q0 107 45 187t139 123q-94 41 -139 121t-45 189v206q0 132 -47 222.5t-156 125.5l41 117q194 -55 276.5 -174.5t82.5 -290.5v-206q0 -113 50.5 -174.5t158.5 -61.5v-147q-108 0 -158.5 -62.5t-50.5 -174.5v-205q0 -170 -82.5 -290 t-276.5 -175z" />
+<glyph unicode="~" horiz-adv-x="1391" d="M128 474q0 136 85.5 232.5t217.5 96.5q88 0 163 -34.5t160 -104.5q58 -51 106 -74t100 -23q66 0 114.5 57t48.5 134l141 -18q0 -137 -87 -238t-217 -101q-90 0 -163.5 33t-158.5 107q-59 48 -108 72t-99 24q-67 0 -114.5 -53t-47.5 -128z" />
+<glyph unicode="&#xa1;" horiz-adv-x="507" d="M144 -374v978h197v-978h-197zM144 876v206h197v-206h-197z" />
+<glyph unicode="&#xa2;" horiz-adv-x="1122" d="M107 520v42q0 199 95 344.5t276 183.5v228h198v-223q157 -24 252.5 -130.5t92.5 -250.5l-2 -5h-179q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h178l3 -6q3 -122 -98 -223t-247 -126v-232 h-198v236q-182 36 -276.5 182t-94.5 347z" />
+<glyph unicode="&#xa3;" horiz-adv-x="1194" d="M70 615v155h158l-10 270q0 204 112 320.5t300 116.5q200 0 310 -104.5t106 -276.5l-2 -6h-190q0 118 -63 175t-161 57q-99 0 -157 -74.5t-58 -207.5l10 -270h418v-155h-413l6 -149q0 -90 -15.5 -171.5t-44.5 -140.5h735l-1 -154h-976v154h10q48 13 72 111t24 201l-6 149 h-164z" />
+<glyph unicode="&#xa4;" horiz-adv-x="1456" d="M104 112l138 140q-50 76 -76.5 166.5t-26.5 189.5q0 102 28.5 196t82.5 172l-146 149l139 139l143 -146q74 55 163 85.5t185 30.5q97 0 186 -31t164 -87l146 149l140 -140l-150 -153q52 -78 80.5 -170.5t28.5 -193.5q0 -98 -26.5 -187.5t-74.5 -165.5l142 -143l-140 -139 l-133 135q-77 -62 -169.5 -95t-193.5 -33t-193.5 32.5t-167.5 93.5l-130 -132zM321 608q0 -188 120.5 -320.5t292.5 -132.5q170 0 290.5 132.5t120.5 320.5q0 186 -120.5 318t-290.5 132q-172 0 -292.5 -132t-120.5 -318z" />
+<glyph unicode="&#xa5;" horiz-adv-x="1243" d="M30 1456h226l359 -663l360 663h224l-418 -718h312v-155h-383v-135h383v-155h-383v-293h-197v293h-375v155h375v135h-375v155h311z" />
+<glyph unicode="&#xa6;" horiz-adv-x="499" d="M145 -270v792h197v-792h-197zM145 698v758h197v-758h-197z" />
+<glyph unicode="&#xa7;" horiz-adv-x="1259" d="M94 551q0 91 47 161.5t134 111.5q-68 50 -102 119.5t-34 166.5q0 166 134 266.5t358 100.5q233 0 363 -111.5t126 -313.5l-3 -6h-188q0 118 -79 197t-219 79q-145 0 -220 -59.5t-75 -150.5q0 -99 67 -148.5t278 -107.5q244 -69 355.5 -159.5t111.5 -265.5q0 -94 -48 -164 t-135 -110q69 -51 104 -119t35 -166q0 -172 -133 -269.5t-358 -97.5q-221 0 -372 102.5t-146 322.5l2 6l188 2q0 -143 96.5 -210.5t231.5 -67.5q137 0 215.5 59.5t78.5 150.5t-72 141.5t-276 113.5q-239 63 -352 156t-113 270zM291 553q0 -100 68 -151.5t278 -110.5 q56 -17 93 -28t70 -23q72 20 112 69.5t40 118.5q0 91 -73.5 144.5t-275.5 116.5q-47 12 -88.5 24.5t-77.5 27.5q-73 -19 -109.5 -69t-36.5 -119z" />
+<glyph unicode="&#xa8;" horiz-adv-x="1021" d="M170 1256v200h219v-200h-219zM640 1256v200h219v-200h-219z" />
+<glyph unicode="&#xa9;" horiz-adv-x="1604" d="M88 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -265 171.5 -447t417.5 -182q245 0 417 182t172 447q0 263 -172 444t-417 181q-246 0 -417.5 -181t-171.5 -444zM436 669v119q0 173 94 280 t254 107q157 0 245.5 -79t84.5 -228l-2 -6h-146q0 95 -45.5 138.5t-136.5 43.5q-94 0 -145 -70.5t-51 -184.5v-120q0 -117 51 -187t145 -70q91 0 136 43t45 141h146l2 -6q4 -151 -84 -229.5t-245 -78.5q-160 0 -254 106.5t-94 280.5z" />
+<glyph unicode="&#xaa;" horiz-adv-x="917" d="M120 920q0 110 84.5 170t245.5 60h139v52q0 63 -30 97t-88 34q-67 0 -103.5 -27t-36.5 -76l-162 13l-1 6q-6 98 78.5 163t224.5 65q134 0 212 -71t78 -205v-314q0 -50 6 -94t20 -87h-174q-8 21 -13 45t-8 50q-33 -47 -89.5 -78t-133.5 -31q-119 0 -184 61t-65 167z M293 924q0 -45 29 -69t89 -24q51 0 105.5 30t72.5 65v110h-138q-75 0 -116.5 -33t-41.5 -79z" />
+<glyph unicode="&#xab;" horiz-adv-x="966" d="M98 507v19l295 389h148l-255 -399l255 -398h-148zM432 507v19l295 389h148l-255 -399l255 -398h-148z" />
+<glyph unicode="&#xac;" horiz-adv-x="1137" d="M127 637v165h835v-427h-198v262h-637z" />
+<glyph unicode="&#xad;" horiz-adv-x="561" d="M35 538v154h490v-154h-490z" />
+<glyph unicode="&#xae;" horiz-adv-x="1604" d="M88 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -266 171.5 -447.5t417.5 -181.5q244 0 416 182t172 447q0 264 -171.5 444.5t-416.5 180.5q-246 0 -417.5 -180.5t-171.5 -444.5zM504 316 v850h280q152 0 238.5 -65.5t86.5 -191.5q0 -62 -33 -109t-96 -78q66 -26 95.5 -79t29.5 -128v-56q0 -41 3.5 -73.5t13.5 -53.5v-16h-153q-9 21 -11 61.5t-2 82.5v54q0 72 -33.5 106t-110.5 34h-159v-338h-149zM653 784h152q65 1 110.5 32.5t45.5 87.5q0 73 -39.5 102.5 t-137.5 29.5h-131v-252z" />
+<glyph unicode="&#xaf;" horiz-adv-x="950" d="M123 1310v146h721v-146h-721z" />
+<glyph unicode="&#xb0;" horiz-adv-x="763" d="M128 1216q0 106 76 183.5t181 77.5q103 0 177.5 -77.5t74.5 -183.5q0 -108 -74 -182.5t-178 -74.5q-106 0 -181.5 74.5t-75.5 182.5zM259 1216q0 -55 36.5 -91t89.5 -36q52 0 87.5 36t35.5 91t-36 92.5t-87 37.5q-53 0 -89.5 -37.5t-36.5 -92.5z" />
+<glyph unicode="&#xb1;" horiz-adv-x="1097" d="M99 702v154h381v411h177v-411h358v-154h-358v-413h-177v413h-381zM136 4v155h835v-155h-835z" />
+<glyph unicode="&#xb2;" horiz-adv-x="868" d="M119 1240q-6 99 78 169t225 70q135 0 211 -64t76 -180q0 -80 -44.5 -136t-160.5 -161l-153 -135l2 -6h361v-130h-592v130l302 262q69 60 91 97.5t22 79.5q0 50 -28.5 81t-86.5 31q-67 0 -103.5 -32t-36.5 -82h-161z" />
+<glyph unicode="&#xb3;" horiz-adv-x="876" d="M112 882l1 6h163q0 -46 37.5 -74.5t100.5 -28.5q72 0 114 29.5t42 77.5q0 62 -36.5 90.5t-109.5 28.5h-132v126h132q67 0 99.5 28.5t32.5 80.5q0 43 -36.5 72t-105.5 29q-56 0 -90.5 -24t-34.5 -64h-162l-2 6q-6 94 78.5 153.5t210.5 59.5q145 0 229 -59.5t84 -169.5 q0 -55 -35.5 -100.5t-97.5 -71.5q70 -23 108 -71t38 -116q0 -111 -90 -173t-236 -62q-127 0 -217.5 58t-84.5 169z" />
+<glyph unicode="&#xb4;" horiz-adv-x="654" d="M131 1211l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xb5;" d="M153 -416v1498h196v-642q2 -178 57.5 -242.5t155.5 -64.5q98 0 158.5 36t92.5 106v807h197v-1082h-177l-9 108q-44 -63 -107.5 -96t-146.5 -33q-72 0 -126.5 16.5t-94.5 51.5v-463h-196z" />
+<glyph unicode="&#xb6;" horiz-adv-x="1006" d="M63 988q0 207 129.5 337.5t362.5 130.5h281v-1456h-197v520h-84q-233 0 -362.5 129.5t-129.5 338.5z" />
+<glyph unicode="&#xb7;" horiz-adv-x="540" d="M161 624v212h198v-212h-198z" />
+<glyph unicode="&#xb8;" horiz-adv-x="509" d="M119 -326q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph unicode="&#xb9;" horiz-adv-x="557" d="M95 1320v134l301 23v-812h-174v655h-127z" />
+<glyph unicode="&#xba;" horiz-adv-x="933" d="M120 1025v117q0 148 94 241.5t251 93.5q158 0 252 -93.5t94 -241.5v-117q0 -149 -93.5 -241.5t-250.5 -92.5q-158 0 -252.5 92.5t-94.5 241.5zM293 1025q0 -88 44 -140.5t130 -52.5q83 0 127.5 53t44.5 140v117q0 84 -45 137.5t-129 53.5t-128 -53.5t-44 -137.5v-117z " />
+<glyph unicode="&#xbb;" horiz-adv-x="966" d="M110 152l255 398l-255 399h148l295 -389v-19l-295 -389h-148zM456 152l255 398l-255 399h148l295 -389v-19l-295 -389h-148z" />
+<glyph unicode="&#xbc;" horiz-adv-x="1595" d="M184 1319v134l301 23v-812h-174v655h-127zM339 185l711 1138l109 -67l-711 -1138zM785 254l422 547h173v-519h126v-130h-126v-152h-170v152h-417zM967 282h243v310l-6 1l-13 -22z" />
+<glyph unicode="&#xbd;" horiz-adv-x="1708" d="M184 1319v134l301 23v-812h-174v655h-127zM352 185l711 1138l109 -67l-711 -1138zM930 573q-6 99 78 169t225 70q135 0 211 -64t76 -180q0 -80 -44.5 -136t-160.5 -161l-153 -135l2 -6h361v-130h-592v130l302 262q69 60 91 97.5t22 79.5q0 50 -28.5 81t-86.5 31 q-67 0 -103.5 -32t-36.5 -82h-161z" />
+<glyph unicode="&#xbe;" horiz-adv-x="1781" d="M128 883l1 6h163q0 -46 37.5 -74.5t100.5 -28.5q72 0 114 29.5t42 77.5q0 62 -36.5 90.5t-109.5 28.5h-132v126h132q67 0 99.5 28.5t32.5 80.5q0 43 -36.5 72t-105.5 29q-56 0 -90.5 -24t-34.5 -64h-162l-2 6q-6 94 78.5 153.5t210.5 59.5q145 0 229 -59.5t84 -169.5 q0 -55 -35.5 -100.5t-97.5 -71.5q70 -23 108 -71t38 -116q0 -111 -90 -173t-236 -62q-127 0 -217.5 58t-84.5 169zM522 185l711 1138l109 -67l-711 -1138zM974 254l422 547h173v-519h126v-130h-126v-152h-170v152h-417zM1156 282h243v310l-6 1l-13 -22z" />
+<glyph unicode="&#xbf;" horiz-adv-x="1013" d="M114 -13q0 127 70 233.5t187 220.5q53 53 65 96t12 135h197q-2 -146 -26 -202t-125 -147q-100 -118 -141.5 -181t-41.5 -150q0 -106 56 -163t162 -57q90 0 154.5 49.5t64.5 145.5h188l3 -6q2 -161 -114.5 -258t-295.5 -97q-198 0 -306.5 100.5t-108.5 280.5zM441 874v209 h206v-209h-206z" />
+<glyph unicode="&#xc0;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM378 1820l3 6h230l175 -266h-158zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#xc1;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM613 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xc2;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM356 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#xc3;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM316 1628q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM420 540h490l-240 663h-6z " />
+<glyph unicode="&#xc4;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM319 1605v200h219v-200h-219zM420 540h490l-240 663h-6zM789 1605v200h219v-200h-219z" />
+<glyph unicode="&#xc5;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM457 1734q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54q-87 0 -147.5 54t-60.5 140zM560 1734q0 -43 31 -73.5t74 -30.5q42 0 72 29.5 t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph unicode="&#xc6;" horiz-adv-x="1922" d="M-20 0l880 1456h967v-155h-691l20 -466h590v-155h-584l22 -526h705v-154h-895l-15 350h-557l-202 -350h-240zM525 529h447l-31 710l-5 2z" />
+<glyph unicode="&#xc7;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM581 -334 q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph unicode="&#xc8;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM303 1820l3 6h230l175 -266h-158z" />
+<glyph unicode="&#xc9;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM538 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xca;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM322 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#xcb;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM284 1605v200h219v-200h-219zM754 1605v200h219v-200h-219z" />
+<glyph unicode="&#xcc;" horiz-adv-x="579" d="M-34 1820l3 6h230l175 -266h-158zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#xcd;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198zM199 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xce;" horiz-adv-x="579" d="M-15 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#xcf;" horiz-adv-x="579" d="M-53 1605v200h219v-200h-219zM190 0v1456h198v-1456h-198zM417 1605v200h219v-200h-219z" />
+<glyph unicode="&#xd0;" horiz-adv-x="1379" d="M42 663v155h168v638h447q286 0 459 -175.5t173 -453.5v-199q0 -279 -173 -453.5t-459 -174.5h-447v663h-168zM407 154h250q202 0 318.5 133t116.5 341v201q0 206 -116.5 339t-318.5 133h-250v-483h276v-155h-276v-509z" />
+<glyph unicode="&#xd1;" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197zM381 1628q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#xd2;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM373 1841l3 6h230l175 -266h-158z" />
+<glyph unicode="&#xd3;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM608 1577l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xd4;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM392 1622v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#xd5;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM351 1649q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#xd6;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM354 1626v200h219v-200h-219zM824 1626v200h219v-200h-219z" />
+<glyph unicode="&#xd7;" horiz-adv-x="1096" d="M88 351l327 334l-327 334l126 126l326 -333l327 333l126 -126l-328 -334l328 -334l-126 -126l-327 332l-326 -332z" />
+<glyph unicode="&#xd8;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q94 0 178.5 -25.5t156.5 -71.5l81 137h149l-132 -221q77 -84 119.5 -197t42.5 -242v-259q0 -267 -165.5 -443t-429.5 -176q-85 0 -160.5 20.5t-139.5 60.5l-91 -154h-149l139 234q-84 84 -128.5 202t-44.5 256zM310 598 q0 -85 19 -158t54 -125l6 -1l544 916q-50 41 -112 63t-134 22q-172 0 -274.5 -128t-102.5 -328v-261zM475 208q44 -34 97 -51t115 -17q183 0 290.5 127.5t107.5 330.5v261q0 75 -16.5 142t-46.5 117l-6 1z" />
+<glyph unicode="&#xd9;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM372 1820l3 6h230l175 -266h-158z" />
+<glyph unicode="&#xda;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM607 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xdb;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM391 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#xdc;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM353 1605v200h219v-200h-219zM823 1605v200h219v-200h-219z" />
+<glyph unicode="&#xdd;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM535 1555l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xde;" horiz-adv-x="1209" d="M163 0v1456h197v-293h269q232 0 362 -118t130 -307q0 -190 -130 -307.5t-362 -117.5h-269v-313h-197zM360 467h269q147 0 220.5 78t73.5 191q0 114 -73.5 193.5t-220.5 79.5h-269v-542z" />
+<glyph unicode="&#xdf;" horiz-adv-x="1221" d="M137 0v1082q0 223 117.5 348t300.5 125q161 0 262 -86t101 -253q0 -118 -64.5 -228t-64.5 -167q0 -82 173.5 -224t173.5 -281q0 -167 -104.5 -252t-282.5 -85q-84 0 -172.5 20.5t-125.5 50.5l44 159q43 -28 108 -52t126 -24q108 0 159 47.5t51 125.5q0 84 -173.5 227.5 t-173.5 289.5q0 80 70.5 190.5t70.5 186.5q0 93 -51 147t-117 54q-104 0 -168 -83.5t-64 -235.5v-1082h-196z" />
+<glyph unicode="&#xe0;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM230 1498l3 6h230l175 -266h-158zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#xe1;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM465 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xe2;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM249 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#xe3;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM208 1306q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55 t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#xe4;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM211 1283v200h219v-200h-219zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM681 1283v200h219v-200h-219z" />
+<glyph unicode="&#xe5;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM346 1412q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54q-87 0 -147.5 54t-60.5 140z M449 1412q0 -43 31 -73.5t74 -30.5q42 0 72 29.5t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph unicode="&#xe6;" horiz-adv-x="1729" d="M58 304q0 158 115 244.5t335 86.5h229v85q0 106 -51.5 166.5t-149.5 60.5q-103 0 -164 -55t-61 -133l-188 18l-2 6q-5 138 109.5 228.5t305.5 90.5q114 0 201.5 -40.5t137.5 -117.5q64 75 151.5 116.5t188.5 41.5q214 0 329.5 -130t115.5 -358v-119h-709l-2 -5 q1 -159 79.5 -258t233.5 -99q103 0 169.5 27.5t144.5 78.5l67 -138q-53 -44 -147 -83t-234 -39q-136 0 -240 48.5t-170 138.5q-56 -79 -167.5 -133t-271.5 -54q-170 0 -262.5 87t-92.5 238zM255 300q0 -74 50 -120.5t147 -46.5q76 0 159 43.5t126 100.5v216h-227 q-120 0 -187.5 -56t-67.5 -137zM953 645l2 -5h508v31q0 122 -60 199t-188 77q-113 0 -182 -84.5t-80 -217.5z" />
+<glyph unicode="&#xe7;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM440 -334q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph unicode="&#xe8;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM233 1499l3 6h230l175 -266h-158zM307 654l2 -5 h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#xe9;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5zM468 1235l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xea;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM252 1280v26l246 237h120l248 -238v-25h-161 l-147 148l-146 -148h-160zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#xeb;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM214 1284v200h219v-200h-219zM307 654l2 -5h499 v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM684 1284v200h219v-200h-219z" />
+<glyph unicode="&#xec;" horiz-adv-x="515" d="M-71 1477l3 6h230l175 -266h-158zM153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#xed;" horiz-adv-x="515" d="M153 0v1082h197v-1082h-197zM162 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xee;" horiz-adv-x="515" d="M-52 1258v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#xef;" horiz-adv-x="515" d="M-90 1262v200h219v-200h-219zM153 0v1082h197v-1082h-197zM380 1262v200h219v-200h-219z" />
+<glyph unicode="&#xf0;" horiz-adv-x="1202" d="M72 466q0 228 138 370t351 142q90 0 169.5 -37t131.5 -97l4 5q-9 109 -51.5 197t-110.5 154l-290 -165l-77 102l256 146q-39 22 -80.5 39t-85.5 31l60 164q79 -19 151 -52t135 -79l218 125l77 -102l-195 -112q95 -104 147 -241.5t52 -300.5v-220q0 -245 -144 -400.5 t-359 -155.5q-218 0 -357.5 140t-139.5 347zM269 466q0 -132 82 -232.5t222 -100.5q133 0 217.5 114t84.5 288v148q-35 59 -115.5 99.5t-198.5 40.5q-131 0 -211.5 -104t-80.5 -253z" />
+<glyph unicode="&#xf1;" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197zM231 1306q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32 q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#xf2;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM257 1498l3 6h230l175 -266h-158zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113 q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#xf3;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M492 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xf4;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM276 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22 q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#xf5;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM235 1306q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5 t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#xf6;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM238 1283v200h219v-200h-219zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113 q-141 0 -213.5 -113t-72.5 -283v-22zM708 1283v200h219v-200h-219z" />
+<glyph unicode="&#xf7;" horiz-adv-x="1170" d="M71 597v188h998v-188h-998zM472 180v203h198v-203h-198zM472 999v203h198v-203h-198z" />
+<glyph unicode="&#xf8;" d="M97 529v22q0 240 130 395.5t353 155.5q56 0 107.5 -11t97.5 -31l74 149h129l-104 -211q88 -74 135 -190t47 -257v-22q0 -242 -130 -396t-354 -154q-51 0 -97 8.5t-88 24.5l-72 -147h-129l100 204q-96 71 -147.5 191t-51.5 269zM294 529q0 -91 20 -166.5t61 -123.5h6 l332 674q-29 16 -62.5 25t-70.5 9q-141 0 -213.5 -113t-72.5 -283v-22zM469 156q24 -12 52 -17.5t61 -5.5q141 0 214 112t73 284v22q0 80 -17.5 150.5t-49.5 117.5h-6z" />
+<glyph unicode="&#xf9;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM255 1477l3 6h230l175 -266h-158z" />
+<glyph unicode="&#xfa;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM490 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xfb;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM274 1258v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#xfc;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM236 1262v200h219v-200h-219zM706 1262v200h219v-200h-219z" />
+<glyph unicode="&#xfd;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM424 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#xfe;" horiz-adv-x="1186" d="M153 -416v1976h197v-598q53 68 128 104t173 36q201 0 312.5 -159.5t111.5 -421.5v-21q0 -234 -112 -377.5t-309 -143.5q-100 0 -175.5 33.5t-128.5 100.5v-529h-197zM350 275q37 -67 97 -104.5t147 -37.5q140 0 212 102.5t72 264.5v21q0 184 -72.5 302.5t-213.5 118.5 q-85 0 -145 -38.5t-97 -105.5v-523z" />
+<glyph unicode="&#xff;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM170 1262v200h219v-200h-219zM640 1262v200h219v-200h-219z" />
+<glyph unicode="&#x100;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM303 1640v146h721v-146h-721zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x101;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM200 1318v146h721v-146h-721zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x102;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM369 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x103;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM261 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141 z" />
+<glyph unicode="&#x104;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM962 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5 q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x105;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM667 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5 l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x106;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM588 1577 l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x107;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM447 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x108;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM372 1622 v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x109;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM231 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x10a;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM569 1625 v201h218v-201h-218z" />
+<glyph unicode="&#x10b;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM428 1282v201h218v-201h-218z" />
+<glyph unicode="&#x10c;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM364 1866 v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x10d;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM223 1523v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x10e;" horiz-adv-x="1349" d="M180 0v1456h447q286 0 459 -175.5t173 -453.5v-199q0 -279 -173 -453.5t-459 -174.5h-447zM306 1845v20h166l147 -148l147 148h170v-18l-257 -245h-119zM377 154h250q202 0 318.5 133t116.5 341v201q0 206 -116.5 339t-318.5 133h-250v-1147z" />
+<glyph unicode="&#x10f;" horiz-adv-x="1314" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v595h197v-1560h-161l-23 133q-53 -76 -130 -115t-179 -39q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q88 0 148 40t98 112v505q-38 67 -98.5 106.5t-145.5 39.5 q-142 0 -209.5 -117t-67.5 -304v-21zM1090 1183l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x110;" horiz-adv-x="1379" d="M42 663v155h168v638h447q286 0 459 -175.5t173 -453.5v-199q0 -279 -173 -453.5t-459 -174.5h-447v663h-168zM407 154h250q202 0 318.5 133t116.5 341v201q0 206 -116.5 339t-318.5 133h-250v-483h276v-155h-276v-509z" />
+<glyph unicode="&#x111;" horiz-adv-x="1194" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v266h-247v155h247v174h197v-174h197v-155h-197v-1231h-161l-23 133q-53 -76 -130 -115t-179 -39q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q88 0 148 40t98 112v505 q-38 67 -98.5 106.5t-145.5 39.5q-142 0 -209.5 -117t-67.5 -304v-21z" />
+<glyph unicode="&#x112;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM273 1640v146h721v-146h-721z" />
+<glyph unicode="&#x113;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM203 1319v146h721v-146h-721zM307 654l2 -5h499 v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x114;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM334 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x115;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM264 1543l2 6h151q0 -66 34 -107t108 -41 q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x116;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM519 1604v201h218v-201h-218z" />
+<glyph unicode="&#x117;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5zM449 1283v201h218v-201h-218z" />
+<glyph unicode="&#x118;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM399 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z " />
+<glyph unicode="&#x119;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5zM560 -161q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x11a;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM314 1845v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x11b;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM244 1524v20h166l147 -148l147 148h170v-18 l-257 -245h-119zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x11c;" horiz-adv-x="1396" d="M120 578v300q0 265 159 432t410 167q250 0 393 -123t146 -317l-2 -6h-188q-9 127 -96.5 209t-252.5 82q-167 0 -269 -125t-102 -317v-302q0 -194 114 -319.5t290 -125.5q124 0 203 33t113 75v331h-319v155h516v-534q-52 -80 -180.5 -147t-332.5 -67q-261 0 -431.5 167 t-170.5 432zM362 1622v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x11d;" d="M100 500v21q0 261 114 421t315 160q103 0 181 -41.5t130 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l50 153q53 -30 128 -48.5t148 -18.5q144 0 209.5 65.5t65.5 199.5v122q-53 -68 -127 -102.5t-170 -34.5q-199 0 -313 144 t-114 377zM258 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM297 500q0 -163 69 -262t210 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -211 -118t-70 -303v-21z" />
+<glyph unicode="&#x11e;" horiz-adv-x="1396" d="M120 578v300q0 265 159 432t410 167q250 0 393 -123t146 -317l-2 -6h-188q-9 127 -96.5 209t-252.5 82q-167 0 -269 -125t-102 -317v-302q0 -194 114 -319.5t290 -125.5q124 0 203 33t113 75v331h-319v155h516v-534q-52 -80 -180.5 -147t-332.5 -67q-261 0 -431.5 167 t-170.5 432zM374 1885l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x11f;" d="M100 500v21q0 261 114 421t315 160q103 0 181 -41.5t130 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l50 153q53 -30 128 -48.5t148 -18.5q144 0 209.5 65.5t65.5 199.5v122q-53 -68 -127 -102.5t-170 -34.5q-199 0 -313 144 t-114 377zM270 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM297 500q0 -163 69 -262t210 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -211 -118t-70 -303v-21z" />
+<glyph unicode="&#x120;" horiz-adv-x="1396" d="M120 578v300q0 265 159 432t410 167q250 0 393 -123t146 -317l-2 -6h-188q-9 127 -96.5 209t-252.5 82q-167 0 -269 -125t-102 -317v-302q0 -194 114 -319.5t290 -125.5q124 0 203 33t113 75v331h-319v155h516v-534q-52 -80 -180.5 -147t-332.5 -67q-261 0 -431.5 167 t-170.5 432zM559 1625v201h218v-201h-218z" />
+<glyph unicode="&#x121;" d="M100 500v21q0 261 114 421t315 160q103 0 181 -41.5t130 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l50 153q53 -30 128 -48.5t148 -18.5q144 0 209.5 65.5t65.5 199.5v122q-53 -68 -127 -102.5t-170 -34.5q-199 0 -313 144 t-114 377zM297 500q0 -163 69 -262t210 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -211 -118t-70 -303v-21zM455 1282v201h218v-201h-218z" />
+<glyph unicode="&#x122;" horiz-adv-x="1396" d="M120 578v300q0 265 159 432t410 167q250 0 393 -123t146 -317l-2 -6h-188q-9 127 -96.5 209t-252.5 82q-167 0 -269 -125t-102 -317v-302q0 -194 114 -319.5t290 -125.5q124 0 203 33t113 75v331h-319v155h516v-534q-52 -80 -180.5 -147t-332.5 -67q-261 0 -431.5 167 t-170.5 432zM521 -494l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x123;" d="M100 500v21q0 261 114 421t315 160q103 0 181 -41.5t130 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l50 153q53 -30 128 -48.5t148 -18.5q144 0 209.5 65.5t65.5 199.5v122q-53 -68 -127 -102.5t-170 -34.5q-199 0 -313 144 t-114 377zM297 500q0 -163 69 -262t210 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -211 -118t-70 -303v-21zM459 1253v148l121 247h97l-21 -257v-138h-197z" />
+<glyph unicode="&#x124;" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197zM415 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x125;" d="M143 0v1560h197v-623q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-678h-197v680q0 134 -57.5 198t-171.5 64q-82 0 -148.5 -38.5t-109.5 -104.5v-799h-197zM203 1600v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x126;" horiz-adv-x="1439" d="M31 1024v145h147v287h197v-287h707v287h197v-287h144v-145h-144v-1024h-197v643h-707v-643h-197v1024h-147zM375 798h707v226h-707v-226z" />
+<glyph unicode="&#x127;" horiz-adv-x="1194" d="M1 1231v155h172v174h197v-174h272v-155h-272v-294q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-678h-197v680q0 134 -57.5 198t-171.5 64q-82 0 -148.5 -38.5t-109.5 -104.5v-799h-197v1231h-172z" />
+<glyph unicode="&#x128;" horiz-adv-x="579" d="M-56 1628q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x129;" horiz-adv-x="515" d="M-93 1285q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x12a;" horiz-adv-x="579" d="M-64 1640v146h721v-146h-721zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x12b;" horiz-adv-x="515" d="M-101 1299v146h721v-146h-721zM153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x12c;" horiz-adv-x="579" d="M-3 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x12d;" horiz-adv-x="515" d="M-40 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x12e;" horiz-adv-x="579" d="M46 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x12f;" horiz-adv-x="516" d="M14 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154zM159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197z" />
+<glyph unicode="&#x130;" horiz-adv-x="579" d="M180 1604v201h218v-201h-218zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x131;" horiz-adv-x="515" d="M153 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x132;" horiz-adv-x="1709" d="M190 0v1456h198v-1456h-198zM645 395l2 6h189q0 -135 68.5 -201.5t193.5 -66.5q109 0 178 73.5t69 196.5v1053h197v-1053q0 -195 -123.5 -309.5t-320.5 -114.5q-210 0 -334 106.5t-119 309.5z" />
+<glyph unicode="&#x133;" horiz-adv-x="1046" d="M159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197zM450 -419l14 155q14 -5 40 -8.5t43 -3.5q65 0 103.5 44t38.5 143v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM683 1363v197h197v-197h-197z" />
+<glyph unicode="&#x134;" horiz-adv-x="1130" d="M66 395l2 6h189q0 -135 68.5 -201.5t193.5 -66.5q109 0 178 73.5t69 196.5v1053h197v-1053q0 -195 -123.5 -309.5t-320.5 -114.5q-210 0 -334 106.5t-119 309.5zM550 1589v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x135;" horiz-adv-x="523" d="M-68 -419l14 150q14 -5 46.5 -9t50.5 -4q59 0 93.5 51.5t34.5 141.5v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM-34 1240v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x136;" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197zM487 -477l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x137;" horiz-adv-x="1050" d="M144 0v1560h197v-904h126l296 426h236l-370 -492l423 -590h-232l-351 499h-128v-499h-197zM388 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x138;" horiz-adv-x="1144" d="M153 0v1082h197v-457h84l388 457h231l2 -5l-450 -514l483 -558l-2 -5h-241l-394 459h-101v-459h-197z" />
+<glyph unicode="&#x139;" horiz-adv-x="1106" d="M180 0v1456h197v-1302h689v-154h-886zM186 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x13a;" horiz-adv-x="516" d="M159 0v1560h197v-1560h-197zM168 1594l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x13b;" horiz-adv-x="1106" d="M180 0v1456h197v-1302h689v-154h-886zM480 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x13c;" horiz-adv-x="516" d="M110 -475l61 246v131h158v-140l-122 -237h-97zM159 0v1560h197v-1560h-197z" />
+<glyph unicode="&#x13d;" horiz-adv-x="1106" d="M180 0v1456h197v-1302h689v-154h-886zM583 1080l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x13e;" horiz-adv-x="666" d="M159 0v1560h197v-1560h-197zM453 1183l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x13f;" horiz-adv-x="1106" d="M180 0v1456h197v-1302h689v-154h-886zM613 688v201h218v-201h-218z" />
+<glyph unicode="&#x140;" horiz-adv-x="736" d="M159 0v1560h197v-1560h-197zM485 671v201h218v-201h-218z" />
+<glyph unicode="&#x141;" horiz-adv-x="1077" d="M40 576v166l123 39v675h197v-613l269 86v-166l-269 -86v-523h689v-154h-886v615z" />
+<glyph unicode="&#x142;" horiz-adv-x="558" d="M37 578v165l142 54v763h197v-688l150 58v-165l-150 -58v-707h-197v632z" />
+<glyph unicode="&#x143;" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197zM638 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x144;" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197zM488 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x145;" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197zM580 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x146;" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197zM430 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x147;" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197zM414 1845v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x148;" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197zM264 1523v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x149;" d="M-32 1183l61 246v131h158v-140l-122 -237h-97zM143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-85 0 -150.5 -41t-104.5 -112v-789h-197z" />
+<glyph unicode="&#x14a;" horiz-adv-x="1416" d="M161 0v1456h197l701 -1112l6 2v1110h197v-1545q0 -167 -86 -257.5t-240 -90.5q-31 0 -57 4.5t-55 13.5l14 150q13 -5 47 -9t51 -4q60 0 94.5 51.5t34.5 141.5v89l-701 1112l-6 -2v-1110h-197z" />
+<glyph unicode="&#x14b;" d="M143 0v1082h176l13 -150q54 81 134 125.5t181 44.5q174 0 270 -102.5t96 -316.5v-772q0 -167 -86 -257.5t-240 -90.5q-31 0 -57.5 4.5t-54.5 13.5l14 160q13 -5 46.5 -8.5t51.5 -3.5q61 0 95 47t34 135v768q0 143 -57 203t-173 60q-85 0 -146.5 -33t-99.5 -92v-817h-197z " />
+<glyph unicode="&#x14c;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM343 1661v146h721v-146h-721z" />
+<glyph unicode="&#x14d;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM227 1318v146h721v-146h-721zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113 q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x14e;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM404 1885l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x14f;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM288 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM294 529 q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x150;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM462 1622l184 266h211l2 -5l-240 -261h-157zM731 1627l241 261h229l3 -6l-300 -260h-171z" />
+<glyph unicode="&#x151;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M346 1279l184 266h211l2 -5l-240 -261h-157zM615 1284l241 261h229l3 -6l-300 -260h-171z" />
+<glyph unicode="&#x152;" horiz-adv-x="1960" d="M104 576v304q0 265 154.5 431t403.5 166q69 0 140.5 -6t150.5 -15h907v-155h-758v-471h667v-155h-667v-521h769v-154h-918q-92 -10 -157 -15.5t-132 -5.5q-249 0 -404.5 166t-155.5 431zM301 576q0 -214 97 -328t266 -114q61 0 122 4.5t119 13.5v1151q-61 8 -122 13.5 t-121 5.5q-169 0 -265 -113.5t-96 -326.5v-306z" />
+<glyph unicode="&#x153;" horiz-adv-x="1854" d="M97 529v22q0 240 130 395.5t353 155.5q130 0 230 -54.5t164 -152.5q65 97 161.5 152t204.5 55q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-131 0 -232.5 52.5t-166.5 148.5 q-64 -96 -163 -148.5t-226 -52.5q-224 0 -354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM1085 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5 t-86 -209.5z" />
+<glyph unicode="&#x154;" horiz-adv-x="1357" d="M180 0v1455h527q239 0 365 -106t126 -308q0 -112 -58.5 -195t-170.5 -132q120 -39 172.5 -126.5t52.5 -216.5v-137q0 -68 15 -122t52 -88v-24h-203q-39 34 -50 100t-11 136v133q0 118 -69 190t-185 72h-366v-631h-197zM377 786h310q167 0 240.5 63.5t73.5 193.5 q0 123 -71.5 190.5t-222.5 67.5h-330v-515zM530 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x155;" horiz-adv-x="702" d="M143 0v1082h176l19 -158q46 84 113.5 131t155.5 47q22 0 42 -3.5t33 -7.5l-27 -183l-101 6q-78 0 -131.5 -37t-82.5 -104v-773h-197zM323 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x156;" horiz-adv-x="1357" d="M180 0v1455h527q239 0 365 -106t126 -308q0 -112 -58.5 -195t-170.5 -132q120 -39 172.5 -126.5t52.5 -216.5v-137q0 -68 15 -122t52 -88v-24h-203q-39 34 -50 100t-11 136v133q0 118 -69 190t-185 72h-366v-631h-197zM377 786h310q167 0 240.5 63.5t73.5 193.5 q0 123 -71.5 190.5t-222.5 67.5h-330v-515zM472 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x157;" horiz-adv-x="702" d="M107 -475l61 246v131h158v-140l-122 -237h-97zM143 0v1082h176l19 -158q46 84 113.5 131t155.5 47q22 0 42 -3.5t33 -7.5l-27 -183l-101 6q-78 0 -131.5 -37t-82.5 -104v-773h-197z" />
+<glyph unicode="&#x158;" horiz-adv-x="1357" d="M180 0v1455h527q239 0 365 -106t126 -308q0 -112 -58.5 -195t-170.5 -132q120 -39 172.5 -126.5t52.5 -216.5v-137q0 -68 15 -122t52 -88v-24h-203q-39 34 -50 100t-11 136v133q0 118 -69 190t-185 72h-366v-631h-197zM306 1845v20h166l147 -148l147 148h170v-18 l-257 -245h-119zM377 786h310q167 0 240.5 63.5t73.5 193.5q0 123 -71.5 190.5t-222.5 67.5h-330v-515z" />
+<glyph unicode="&#x159;" horiz-adv-x="702" d="M101 1523v20h166l147 -148l147 148h170v-18l-257 -245h-119zM143 0v1082h176l19 -158q46 84 113.5 131t155.5 47q22 0 42 -3.5t33 -7.5l-27 -183l-101 6q-78 0 -131.5 -37t-82.5 -104v-773h-197z" />
+<glyph unicode="&#x15a;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316zM523 1577l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x15b;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245zM445 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x15c;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316zM307 1622v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x15d;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245zM229 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x15e;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316zM516 -334q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph unicode="&#x15f;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245zM438 -333q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph unicode="&#x160;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316zM299 1866v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x161;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245zM221 1523v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x162;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467zM455 -475l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x163;" horiz-adv-x="708" d="M34 936v146h172v261h197v-261h205v-146h-205v-657q0 -76 31.5 -107t83.5 -31q17 0 37.5 4t36.5 10l26 -135q-22 -18 -64.5 -29.5t-85.5 -11.5q-120 0 -191 72.5t-71 227.5v657h-172zM308 -485l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x164;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467zM289 1844v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x165;" horiz-adv-x="748" d="M34 936v146h172v261h197v-261h205v-146h-205v-657q0 -76 31.5 -107t83.5 -31q17 0 37.5 4t36.5 10l26 -135q-22 -18 -64.5 -29.5t-85.5 -11.5q-120 0 -191 72.5t-71 227.5v657h-172zM545 1210l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x166;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-326h220v-155h-220v-820h-197v820h-224v155h224v326h-467z" />
+<glyph unicode="&#x167;" horiz-adv-x="708" d="M-8 600v155h214v181h-172v146h172v261h197v-261h205v-146h-205v-181h230v-155h-230v-321q0 -76 31.5 -107t83.5 -31q17 0 37.5 4t36.5 10l26 -135q-22 -18 -64.5 -29.5t-85.5 -11.5q-120 0 -191 72.5t-71 227.5v321h-214z" />
+<glyph unicode="&#x168;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM350 1628q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32 q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x169;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM233 1285q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159 t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x16a;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM342 1640v146h721v-146h-721z" />
+<glyph unicode="&#x16b;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM225 1299v146h721v-146h-721z" />
+<glyph unicode="&#x16c;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM403 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x16d;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM286 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x16e;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM488 1734q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54 q-87 0 -147.5 54t-60.5 140zM591 1734q0 -43 31 -73.5t74 -30.5q42 0 72 29.5t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph unicode="&#x16f;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM371 1391q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54 q-87 0 -147.5 54t-60.5 140zM474 1391q0 -43 31 -73.5t74 -30.5q42 0 72 29.5t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph unicode="&#x170;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM461 1601l184 266h211l2 -5l-240 -261h-157zM730 1606l241 261h229l3 -6l-300 -260h-171z" />
+<glyph unicode="&#x171;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM344 1258l184 266h211l2 -5l-240 -261h-157zM613 1263l241 261h229l3 -6l-300 -260h-171z" />
+<glyph unicode="&#x172;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM493 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66 t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x173;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM675 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24 q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x174;" horiz-adv-x="1809" d="M54 1456h196l222 -952l27 -182l6 -1l39 183l267 952h174l269 -952l40 -187h6l29 187l217 952h197l-351 -1456h-176l-287 1010l-26 131h-6l-25 -131l-292 -1010h-176zM592 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x175;" horiz-adv-x="1550" d="M45 1082h196l179 -688l23 -131h6l28 131l216 688h158l217 -688l31 -146h6l29 146l170 688h196l-314 -1082h-159l-209 659l-45 184l-6 -1l-43 -183l-206 -659h-159zM467 1258v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x176;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM319 1600v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x177;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM208 1258v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x178;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM281 1604v200h219v-200h-219zM751 1604v200h219v-200h-219z" />
+<glyph unicode="&#x179;" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036zM519 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x17a;" horiz-adv-x="1030" d="M94 0v138l585 788h-578v156h819v-134l-591 -794h625v-154h-860zM434 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x17b;" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036zM500 1604v201h218v-201h-218z" />
+<glyph unicode="&#x17c;" horiz-adv-x="1030" d="M94 0v138l585 788h-578v156h819v-134l-591 -794h625v-154h-860zM415 1261v201h218v-201h-218z" />
+<glyph unicode="&#x17d;" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036zM295 1845v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x17e;" horiz-adv-x="1030" d="M94 0v138l585 788h-578v156h819v-134l-591 -794h625v-154h-860zM210 1502v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x17f;" horiz-adv-x="516" d="M159 0v1219q0 173 91 267.5t253 94.5q33 0 67.5 -5.5t76.5 -15.5l-24 -145q-20 5 -42 8t-47 3q-87 0 -132.5 -54.5t-45.5 -152.5v-1219h-197z" />
+<glyph unicode="&#x192;" horiz-adv-x="702" d="M-23 -419l14 150q12 -5 45.5 -9t51.5 -4q60 0 94 51.5t34 141.5v1025h-169v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-52.5 3q-87 0 -129 -51.5t-42 -149.5v-137h196v-146h-196v-1025q0 -167 -85.5 -257.5 t-239.5 -90.5q-32 0 -58 4.5t-53 13.5z" />
+<glyph unicode="&#x1a0;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
+<glyph unicode="&#x1a1;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112 t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x1af;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5z" />
+<glyph unicode="&#x1b0;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352z" />
+<glyph unicode="&#x1f0;" horiz-adv-x="523" d="M-68 -419l14 150q14 -5 46.5 -9t50.5 -4q59 0 93.5 51.5t34.5 141.5v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM-42 1484v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x1fa;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM487 1684q0 72 51 119.5t124 47.5q70 0 120 -47.5t50 -119.5t-49.5 -118t-120.5 -46q-73 0 -124 46t-51 118zM575 1684q0 -35 25.5 -59.5t61.5 -24.5q34 0 58.5 24t24.5 60 q0 37 -24.5 62.5t-58.5 25.5q-36 0 -61.5 -25.5t-25.5 -62.5zM615 1900l144 185h199l2 -6l-216 -179h-129z" />
+<glyph unicode="&#x1fb;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM383 1362q0 72 51 119.5t124 47.5q70 0 120 -47.5t50 -119.5t-49.5 -118t-120.5 -46q-73 0 -124 46t-51 118zM471 1362 q0 -35 25.5 -59.5t61.5 -24.5q34 0 58.5 24t24.5 60q0 37 -24.5 62.5t-58.5 25.5q-36 0 -61.5 -25.5t-25.5 -62.5zM511 1578l144 185h199l2 -6l-216 -179h-129z" />
+<glyph unicode="&#x1fc;" horiz-adv-x="1922" d="M-20 0l880 1456h967v-155h-691l20 -466h590v-155h-584l22 -526h705v-154h-895l-15 350h-557l-202 -350h-240zM525 529h447l-31 710l-5 2zM845 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1fd;" horiz-adv-x="1729" d="M58 304q0 158 115 244.5t335 86.5h229v85q0 106 -51.5 166.5t-149.5 60.5q-103 0 -164 -55t-61 -133l-188 18l-2 6q-5 138 109.5 228.5t305.5 90.5q114 0 201.5 -40.5t137.5 -117.5q64 75 151.5 116.5t188.5 41.5q214 0 329.5 -130t115.5 -358v-119h-709l-2 -5 q1 -159 79.5 -258t233.5 -99q103 0 169.5 27.5t144.5 78.5l67 -138q-53 -44 -147 -83t-234 -39q-136 0 -240 48.5t-170 138.5q-56 -79 -167.5 -133t-271.5 -54q-170 0 -262.5 87t-92.5 238zM255 300q0 -74 50 -120.5t147 -46.5q76 0 159 43.5t126 100.5v216h-227 q-120 0 -187.5 -56t-67.5 -137zM769 1235l185 266h230l2 -6l-270 -260h-147zM953 645l2 -5h508v31q0 122 -60 199t-188 77q-113 0 -182 -84.5t-80 -217.5z" />
+<glyph unicode="&#x1fe;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q94 0 178.5 -25.5t156.5 -71.5l81 137h149l-132 -221q77 -84 119.5 -197t42.5 -242v-259q0 -267 -165.5 -443t-429.5 -176q-85 0 -160.5 20.5t-139.5 60.5l-91 -154h-149l139 234q-84 84 -128.5 202t-44.5 256zM310 598 q0 -85 19 -158t54 -125l6 -1l544 916q-50 41 -112 63t-134 22q-172 0 -274.5 -128t-102.5 -328v-261zM475 208q44 -34 97 -51t115 -17q183 0 290.5 127.5t107.5 330.5v261q0 75 -16.5 142t-46.5 117l-6 1zM608 1618l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1ff;" d="M97 529v22q0 240 130 395.5t353 155.5q56 0 107.5 -11t97.5 -31l74 149h129l-104 -211q88 -74 135 -190t47 -257v-22q0 -242 -130 -396t-354 -154q-51 0 -97 8.5t-88 24.5l-72 -147h-129l100 204q-96 71 -147.5 191t-51.5 269zM294 529q0 -91 20 -166.5t61 -123.5h6 l332 674q-29 16 -62.5 25t-70.5 9q-141 0 -213.5 -113t-72.5 -283v-22zM449 1233l185 266h230l2 -6l-270 -260h-147zM469 156q24 -12 52 -17.5t61 -5.5q141 0 214 112t73 284v22q0 80 -17.5 150.5t-49.5 117.5h-6z" />
+<glyph unicode="&#x218;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316zM465 -495l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x219;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245zM387 -494l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#x237;" horiz-adv-x="523" d="M-68 -419l14 150q14 -5 46.5 -9t50.5 -4q59 0 93.5 51.5t34.5 141.5v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x2bc;" horiz-adv-x="418" d="M80 1021l60 343v196h197v-193l-160 -346h-97z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="979" d="M171 1252v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="922" d="M140 1495v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="876" d="M134 1450l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="556" d="M160 1255v201h218v-201h-218z" />
+<glyph unicode="&#x2da;" horiz-adv-x="696" d="M133 1308q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54q-87 0 -147.5 54t-60.5 140zM236 1308q0 -43 31 -73.5t74 -30.5q42 0 72 29.5t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph unicode="&#x2db;" horiz-adv-x="562" d="M68 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="979" d="M135 1275q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="762" d="M100 1252l184 266h211l2 -5l-240 -261h-157zM369 1257l241 261h229l3 -6l-300 -260h-171z" />
+<glyph unicode="&#x2f3;" horiz-adv-x="672" d="M182 -234q0 65 45.5 107.5t111.5 42.5q63 0 108 -42.5t45 -107.5q0 -63 -44.5 -104t-108.5 -41q-66 0 -111.5 41t-45.5 104zM271 -234q0 -26 20 -45t48 -19q26 0 45 18.5t19 45.5q0 30 -19 49.5t-45 19.5q-28 0 -48 -20t-20 -49z" />
+<glyph unicode="&#x300;" horiz-adv-x="0" d="M-815 1558h186l121 -348h-131z" />
+<glyph unicode="&#x301;" horiz-adv-x="0" d="M-657 1210l127 349h182l-188 -349h-121z" />
+<glyph unicode="&#x303;" horiz-adv-x="0" d="M-883 1275q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x309;" horiz-adv-x="0" d="M-677 1546l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x30f;" horiz-adv-x="0" d="M-980 1512l3 6h229l241 -261l-2 -5h-171zM-636 1513l2 5h212l184 -266h-157z" />
+<glyph unicode="&#x323;" horiz-adv-x="0" d="M-708 -137h218v-200h-218v200z" />
+<glyph unicode="&#x384;" horiz-adv-x="526" d="M195 1270l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x385;" horiz-adv-x="1045" d="M161 1256v200h198v-200h-198zM446 1468l51 262h218l-127 -262h-142zM670 1256v200h199v-200h-199z" />
+<glyph unicode="&#x386;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM241 1270l61 380h208l-175 -380h-94zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x387;" horiz-adv-x="541" d="M161 624v212h198v-212h-198z" />
+<glyph unicode="&#x388;" horiz-adv-x="1297" d="M-29 1272l61 380h208l-175 -380h-94zM280 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966z" />
+<glyph unicode="&#x389;" horiz-adv-x="1561" d="M20 1272l61 380h208l-175 -380h-94zM280 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197z" />
+<glyph unicode="&#x38a;" horiz-adv-x="679" d="M24 1271l61 380h208l-175 -380h-94zM290 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x38c;" horiz-adv-x="1416" d="M68 1270l61 380h208l-175 -380h-94zM133 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM330 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261 q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
+<glyph unicode="&#x38e;" horiz-adv-x="1350" d="M-127 1270l61 380h208l-175 -380h-94zM120 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525z" />
+<glyph unicode="&#x38f;" horiz-adv-x="1386" d="M61 1270l61 380h208l-175 -380h-94zM132 722v116q0 284 154.5 461.5t403.5 177.5t404.5 -177.5t155.5 -461.5v-116q0 -164 -64 -317.5t-174 -250.5h240v-154h-497v159q141 25 219.5 168.5t78.5 394.5v118q0 233 -96.5 357.5t-266.5 124.5q-169 0 -265 -124.5t-96 -357.5 v-118q0 -251 80.5 -395t223.5 -168v-159h-495v154h234q-112 97 -176 250.5t-64 317.5z" />
+<glyph unicode="&#x390;" horiz-adv-x="672" d="M-51 1184v200h198v-200h-198zM197 279v802h197v-813q0 -73 26.5 -101t71.5 -28q25 0 49 7.5t42 18.5l44 -133q-45 -31 -89.5 -42t-97.5 -11q-119 0 -181 71t-62 229zM234 1396l51 262h218l-127 -262h-142zM458 1184v200h199v-200h-199z" />
+<glyph unicode="&#x391;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x392;" horiz-adv-x="1309" d="M180 0v1456h475q228 0 357 -98.5t129 -295.5q0 -97 -62 -173.5t-163 -113.5q132 -28 207.5 -129t75.5 -235q0 -200 -129.5 -305.5t-351.5 -105.5h-538zM377 154h341q134 0 209 66.5t75 188.5q0 128 -62.5 201t-192.5 73h-370v-529zM377 837h319q110 0 179 60.5t69 168.5 q0 118 -74.5 176.5t-214.5 58.5h-278v-464z" />
+<glyph unicode="&#x393;" horiz-adv-x="1140" d="M180 0v1456h893v-155h-696v-1301h-197z" />
+<glyph unicode="&#x394;" horiz-adv-x="1447" d="M30 0l617 1456h169l576 -1456h-1362zM294 154h838l-400 1050h-6z" />
+<glyph unicode="&#x395;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966z" />
+<glyph unicode="&#x396;" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036z" />
+<glyph unicode="&#x397;" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197z" />
+<glyph unicode="&#x398;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM450 659v154h509v-154h-509z" />
+<glyph unicode="&#x399;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x39a;" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197z" />
+<glyph unicode="&#x39b;" horiz-adv-x="1345" d="M49 0l534 1456h170l534 -1456h-201l-415 1171h-6l-415 -1171h-201z" />
+<glyph unicode="&#x39c;" horiz-adv-x="1799" d="M180 0v1456h252l464 -1183h6l464 1183h252v-1456h-197v576l20 592l-5 1l-472 -1169h-131l-470 1166l-5 -1l19 -589v-576h-197z" />
+<glyph unicode="&#x39d;" horiz-adv-x="1461" d="M180 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197z" />
+<glyph unicode="&#x39e;" horiz-adv-x="1173" d="M123 0v154h937v-154h-937zM124 1301v155h924v-155h-924zM206 678v155h761v-155h-761z" />
+<glyph unicode="&#x39f;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="1463" d="M180 0v1456h1103v-1456h-198v1301h-708v-1301h-197z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="1312" d="M180 0v1456h557q233 0 362 -120t129 -316q0 -199 -129 -317.5t-362 -118.5h-360v-584h-197zM377 738h360q148 0 221 79.5t73 200.5t-73.5 202t-220.5 81h-360v-563z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="1173" d="M70 0v147l480 581l-480 581v147h976v-155h-730l-3 -5l445 -557v-24l-445 -555l3 -5h780v-155h-1026z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="1439" d="M84 721q0 219 153.5 362t385.5 147v226h197v-227q230 -5 383.5 -146.5t153.5 -359.5q0 -221 -153.5 -363.5t-383.5 -146.5v-213h-197v213q-232 3 -385.5 145t-153.5 363zM279 721q0 -161 88.5 -254.5t249.5 -92.5l6 2v691l-6 2q-160 1 -249 -93.5t-89 -254.5zM820 376 l6 -2q157 -1 246 93.5t89 255.5q0 159 -89 252.5t-246 93.5l-6 -2v-691z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="1416" d="M87 885v571h196v-571q0 -170 82 -275t218 -125l6 1v970h198v-971l6 -2q144 19 230.5 124.5t86.5 277.5v571h197v-571q0 -245 -143 -393.5t-377 -172.5v-319h-198v320q-227 24 -364.5 172t-137.5 393z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="1366" d="M112 722v116q0 284 154.5 461.5t403.5 177.5t404.5 -177.5t155.5 -461.5v-116q0 -164 -64 -317.5t-174 -250.5h240v-154h-497v159q141 25 219.5 168.5t78.5 394.5v118q0 233 -96.5 357.5t-266.5 124.5q-169 0 -265 -124.5t-96 -357.5v-118q0 -251 80.5 -395t223.5 -168 v-159h-495v154h234q-112 97 -176 250.5t-64 317.5z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="579" d="M-53 1605v200h219v-200h-219zM190 0v1456h198v-1456h-198zM417 1605v200h219v-200h-219z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM281 1604v200h219v-200h-219zM751 1604v200h219v-200h-219z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="1158" d="M98 500v21q0 261 111.5 421t312.5 160q101 0 178.5 -36t132.5 -104l51 119h117v-805q0 -72 20.5 -100t55.5 -28q15 0 28 1.5t24 5.5l23 -142q-29 -20 -59 -27t-67 -7q-75 0 -125 32t-74 101q-55 -66 -131.5 -99.5t-175.5 -33.5q-198 0 -310 143.5t-112 377.5zM295 500 q0 -164 67.5 -265.5t207.5 -101.5q81 0 138 35.5t96 99.5v8v541q-39 60 -96.5 95t-135.5 35q-141 0 -209 -119.5t-68 -306.5v-21zM568 1277l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="1103" d="M98 305q0 91 51.5 155t150.5 96q-87 35 -135 96t-48 134q0 150 116.5 232t317.5 82q183 0 307.5 -87.5t119.5 -226.5l-2 -6h-186q0 70 -69.5 119t-169.5 49q-116 0 -176.5 -47.5t-60.5 -114.5q0 -74 54.5 -116.5t169.5 -42.5h209v-150h-209q-121 0 -181.5 -42.5 t-60.5 -129.5q0 -73 68.5 -123t186.5 -50q112 0 184.5 56t72.5 132h186l2 -6q5 -162 -128 -247.5t-317 -85.5q-202 0 -327.5 86.5t-125.5 237.5zM494 1276l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3ae;" d="M143 0v1082h176l13 -150q54 81 134 125.5t181 44.5q177 0 271.5 -97.5t94.5 -321.5v-1098h-197v1094q0 143 -57 205.5t-173 62.5q-85 0 -146.5 -33.5t-99.5 -93.5v-820h-197zM521 1277l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3af;" horiz-adv-x="672" d="M197 279v802h197v-813q0 -73 26.5 -101t71.5 -28q25 0 49 7.5t42 18.5l44 -133q-45 -31 -89.5 -42t-97.5 -11q-119 0 -181 71t-62 229zM245 1258l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3b0;" d="M141 472v610h197v-612q0 -175 69 -256t186 -81q137 0 204.5 126.5t67.5 302.5q-3 126 -36 255t-88 265h206q51 -107 83 -236.5t32 -283.5q0 -255 -111 -419t-348 -164q-221 0 -341.5 121t-120.5 372zM245 1184v200h198v-200h-198zM530 1396l51 262h218l-127 -262h-142z M754 1184v200h199v-200h-199z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="1158" d="M98 500v21q0 261 111.5 421t312.5 160q101 0 178.5 -36t132.5 -104l51 119h117v-805q0 -72 20.5 -100t55.5 -28q15 0 28 1.5t24 5.5l23 -142q-29 -20 -59 -27t-67 -7q-75 0 -125 32t-74 101q-55 -66 -131.5 -99.5t-175.5 -33.5q-198 0 -310 143.5t-112 377.5zM295 500 q0 -164 67.5 -265.5t207.5 -101.5q81 0 138 35.5t96 99.5v8v541q-39 60 -96.5 95t-135.5 35q-141 0 -209 -119.5t-68 -306.5v-21z" />
+<glyph unicode="&#x3b2;" horiz-adv-x="1213" d="M157 -383v1456q0 165 133 284.5t317 119.5q195 0 313 -110t118 -284q0 -91 -50 -167.5t-137 -121.5q119 -44 185.5 -142t66.5 -227q0 -209 -126.5 -327.5t-328.5 -118.5q-82 0 -158.5 22.5t-135.5 68.5v-453h-197zM354 243q44 -52 114.5 -81t159.5 -29q129 0 203.5 80 t74.5 208q0 112 -65.5 198t-176.5 86h-143v155h82q122 0 180 60.5t58 166.5q0 95 -62.5 165t-171.5 70q-107 0 -180 -71.5t-73 -177.5v-830z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="1031" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-375 -1020v-479h-197v484z" />
+<glyph unicode="&#x3b4;" d="M97 529v22q0 215 105.5 364.5t290.5 179.5l7 1l2 6l-297 236v118h733v-151h-454l-2 -6l371 -277q101 -75 157 -198t56 -273v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283 t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="1103" d="M98 305q0 91 51.5 155t150.5 96q-87 35 -135 96t-48 134q0 150 116.5 232t317.5 82q183 0 307.5 -87.5t119.5 -226.5l-2 -6h-186q0 70 -69.5 119t-169.5 49q-116 0 -176.5 -47.5t-60.5 -114.5q0 -74 54.5 -116.5t169.5 -42.5h209v-150h-209q-121 0 -181.5 -42.5 t-60.5 -129.5q0 -73 68.5 -123t186.5 -50q112 0 184.5 56t72.5 132h186l2 -6q5 -162 -128 -247.5t-317 -85.5q-202 0 -327.5 86.5t-125.5 237.5z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="1071" d="M115 1301v155h855v-112l-342 -432q-129 -153 -185.5 -266.5t-56.5 -258.5q0 -116 52.5 -174.5t154.5 -58.5h32q159 0 249 -63.5t90 -191.5q-2 -111 -79.5 -193.5t-186.5 -129.5l-81 127q66 31 113 74t47 113q0 52 -41 81t-131 29h-52q-179 0 -271.5 107t-92.5 275 q0 120 69.5 280.5t213.5 329.5l268 304l-2 5h-623z" />
+<glyph unicode="&#x3b7;" d="M143 0v1082h176l13 -150q54 81 134 125.5t181 44.5q177 0 271.5 -97.5t94.5 -321.5v-1098h-197v1094q0 143 -57 205.5t-173 62.5q-85 0 -146.5 -33.5t-99.5 -93.5v-820h-197z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="1165" d="M119 555v345q0 278 124.5 427.5t338.5 149.5q215 0 339.5 -149.5t124.5 -427.5v-345q0 -279 -123.5 -427.5t-338.5 -148.5t-340 149t-125 427zM316 515q0 -189 69 -285.5t199 -96.5t197.5 96t67.5 286v133h-533v-133zM316 803h533v139q0 189 -68.5 284.5t-198.5 95.5 t-198 -95.5t-68 -284.5v-139z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="672" d="M197 279v802h197v-813q0 -73 26.5 -101t71.5 -28q25 0 49 7.5t42 18.5l44 -133q-45 -31 -89.5 -42t-97.5 -11q-119 0 -181 71t-62 229z" />
+<glyph unicode="&#x3ba;" horiz-adv-x="1144" d="M153 0v1082h197v-457h84l388 457h231l2 -5l-450 -514l483 -558l-2 -5h-241l-394 459h-101v-459h-197z" />
+<glyph unicode="&#x3bb;" d="M56 0l391 1028l-55 145q-32 84 -75.5 137t-103.5 53q-10 0 -37 -2.5t-31 -2.5v145q20 5 51.5 10t55.5 5q129 0 205.5 -81t116.5 -189l360 -946q22 -71 57.5 -113t79.5 -42q14 0 18.5 0.5t28.5 4.5l-3 -154q-11 -5 -29.5 -10t-29.5 -5q-118 0 -189.5 65t-124.5 205 l-202 531l-6 -1l-29 -113l-230 -670h-219z" />
+<glyph unicode="&#x3bc;" d="M153 -416v1498h196v-642q2 -178 57.5 -242.5t155.5 -64.5q98 0 158.5 36t92.5 106v807h197v-1082h-177l-9 108q-44 -63 -107.5 -96t-146.5 -33q-72 0 -126.5 16.5t-94.5 51.5v-463h-196z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="1030" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-398 -1082h-149z" />
+<glyph unicode="&#x3be;" horiz-adv-x="1043" d="M86 1301v155h836v-155h-296q-123 -8 -185.5 -73t-62.5 -161q0 -94 72.5 -146.5t226.5 -52.5h143v-155h-143q-187 0 -284.5 -78t-97.5 -231q0 -120 80 -195t221 -75h60q161 0 250 -63.5t89 -192.5q-2 -111 -79.5 -193t-186.5 -129l-79 127q65 31 112 73.5t47 112.5 q0 52 -35 82t-110 30h-68q-222 0 -360 113.5t-138 313.5q0 145 79.5 243.5t231.5 142.5q-108 40 -168 110.5t-60 158.5q0 77 30.5 137.5t89.5 100.5h-215z" />
+<glyph unicode="&#x3bf;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="1221" d="M79 926v156h1039v-156h-123v-658q0 -73 26.5 -101t71.5 -28q25 0 49 7.5t42 18.5l44 -133q-45 -31 -89.5 -42t-97.5 -11q-119 0 -181 71t-62 229v647h-395v-926h-197v926h-127z" />
+<glyph unicode="&#x3c1;" d="M143 -416v992v1q0 247 128.5 386t320.5 139q227 0 347.5 -158.5t120.5 -422.5v-21q0 -235 -109.5 -378t-306.5 -143q-97 0 -173 30t-131 88v-513h-197zM340 275q37 -67 97 -104.5t147 -37.5q139 0 209 102t70 265v21q0 189 -66 307.5t-205 118.5q-123 0 -187.5 -115.5 t-64.5 -255.5v-301z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="1102" d="M98 520v42q0 227 127.5 383.5t347.5 156.5q187 0 303.5 -104.5t112.5 -282.5l-2 -6h-178q0 103 -61 170.5t-175 67.5q-138 0 -208 -115t-70 -270v-42q0 -143 82 -243.5t248 -124.5q180 -26 264 -79t84 -176q-2 -111 -79.5 -193t-186.5 -129l-81 127q66 31 113 73.5 t47 112.5q0 48 -44 73.5t-139 38.5q-251 35 -378 170t-127 350z" />
+<glyph unicode="&#x3c3;" d="M97 529v22q0 231 129.5 380.5t352.5 150.5h569v-156h-277q94 -72 144.5 -178t50.5 -236v-22q0 -210 -132 -360.5t-352 -150.5q-224 0 -354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 161 -73.5 268t-215.5 107 q-141 0 -213.5 -107t-72.5 -268v-22z" />
+<glyph unicode="&#x3c4;" horiz-adv-x="1072" d="M81 929v153h907v-153h-358v-929h-197v929h-352z" />
+<glyph unicode="&#x3c5;" d="M141 472v610h197v-612q0 -175 69 -256t186 -81q137 0 204.5 126.5t67.5 302.5q-3 126 -36 255t-88 265h206q51 -107 83 -236.5t32 -283.5q0 -255 -111 -419t-348 -164q-221 0 -341.5 121t-120.5 372z" />
+<glyph unicode="&#x3c6;" horiz-adv-x="1450" d="M83 564q0 153 32 281.5t84 236.5h206q-57 -134 -90 -263t-35 -255q0 -155 81.5 -274t249.5 -142l6 2v932h197q228 0 390.5 -160.5t162.5 -397.5q0 -218 -135.5 -367.5t-417.5 -172.5v-462h-197v462q-274 25 -404 185.5t-130 394.5zM814 147l6 -2q177 21 263.5 129.5 t86.5 249.5q-4 163 -97 281.5t-253 114.5l-6 -2v-771z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="1143" d="M94 1082q21 5 52.5 10t55.5 5q129 0 204.5 -80t117.5 -188l92 -222h6l233 475h198l-341 -707l204 -492q32 -73 63 -110.5t74 -37.5q14 0 19 1t27 4l-3 -162q-10 -6 -28.5 -10.5t-31.5 -4.5q-116 0 -185.5 65.5t-121.5 206.5l-127 300h-6l-265 -550h-209l383 782l-163 386 q-33 82 -76 132.5t-103 50.5q-10 0 -37 -2.5t-31 -2.5z" />
+<glyph unicode="&#x3c8;" horiz-adv-x="1440" d="M91 596v486h197v-488q0 -207 84.5 -316.5t228.5 -128.5l6 2v930h198v-932l6 -2q177 23 263 143.5t86 276.5q-3 125 -36 253.5t-89 261.5h207q51 -106 83 -234t32 -281q0 -240 -133 -401t-419 -183v-457h-198v459q-247 25 -381.5 176t-134.5 435z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="1741" d="M108 562q0 155 42.5 285t112.5 235h206q-74 -134 -117 -263.5t-47 -256.5q0 -190 56 -309.5t176 -119.5q107 0 170.5 81t63.5 256v300h198v-300q0 -175 63 -256t171 -81q120 0 176 118.5t56 310.5q-5 127 -48 256.5t-116 263.5h207q68 -106 111 -236t43 -284 q0 -255 -101 -419t-317 -164q-127 0 -214.5 61t-129.5 180q-43 -119 -130.5 -180t-212.5 -61q-217 0 -318 164t-101 419z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="672" d="M-40 1262v200h219v-200h-219zM197 279v802h197v-813q0 -73 26.5 -101t71.5 -28q25 0 49 7.5t42 18.5l44 -133q-45 -31 -89.5 -42t-97.5 -11q-119 0 -181 71t-62 229zM430 1262v200h219v-200h-219z" />
+<glyph unicode="&#x3cb;" d="M141 472v610h197v-612q0 -175 69 -256t186 -81q137 0 204.5 126.5t67.5 302.5q-3 126 -36 255t-88 265h206q51 -107 83 -236.5t32 -283.5q0 -255 -111 -419t-348 -164q-221 0 -341.5 121t-120.5 372zM256 1262v200h219v-200h-219zM726 1262v200h219v-200h-219z" />
+<glyph unicode="&#x3cc;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M525 1277l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3cd;" d="M141 472v610h197v-612q0 -175 69 -256t186 -81q137 0 204.5 126.5t67.5 302.5q-3 126 -36 255t-88 265h206q51 -107 83 -236.5t32 -283.5q0 -255 -111 -419t-348 -164q-221 0 -341.5 121t-120.5 372zM543 1258l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="1741" d="M108 562q0 155 42.5 285t112.5 235h206q-74 -134 -117 -263.5t-47 -256.5q0 -190 56 -309.5t176 -119.5q107 0 170.5 81t63.5 256v300h198v-300q0 -175 63 -256t171 -81q120 0 176 118.5t56 310.5q-5 127 -48 256.5t-116 263.5h207q68 -106 111 -236t43 -284 q0 -255 -101 -419t-317 -164q-127 0 -214.5 61t-129.5 180q-43 -119 -130.5 -180t-212.5 -61q-217 0 -318 164t-101 419zM813 1258l61 380h208l-175 -380h-94z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="1265" d="M113 592v660l197 2v-662q0 -200 91 -326t246 -126q165 0 260 118.5t97 326.5q-218 8 -350.5 133.5t-132.5 317.5v62q0 172 94.5 275.5t245.5 103.5q157 0 248 -101t91 -278v-506q0 -278 -152.5 -445.5t-400.5 -167.5q-238 0 -386 174t-148 439zM718 1034q0 -120 75 -199 t205 -83l6 2v344q0 108 -36.5 162.5t-106.5 54.5q-66 0 -104.5 -54.5t-38.5 -162.5v-64z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="1089" d="M-22 1443q24 14 49 19t60 5q80 0 141.5 -52t113.5 -176l178 -406l19 -70h6l19 70l178 406q51 124 112.5 176t142.5 52q34 0 59 -5t51 -19l-23 -152q-5 3 -16 5.5t-24 2.5q-33 0 -60.5 -17.5t-43.5 -56.5l-300 -647v-578h-196v578l-300 647q-17 39 -44.5 56.5t-59.5 17.5 q-14 0 -24.5 -2.5t-15.5 -5.5z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="1608" d="M78 926v156h1483v-156h-133q29 -81 45.5 -172t16.5 -192q0 -254 -87 -418.5t-271 -164.5q-119 0 -201.5 60.5t-122.5 176.5q-41 -117 -123 -177t-200 -60q-185 0 -271.5 164.5t-86.5 418.5q0 101 16 192t46 172h-111zM324 562q0 -190 41.5 -309.5t130.5 -119.5 q98 0 156 81t58 256v250h198v-250q0 -175 57.5 -256t156.5 -81q87 0 129 119t42 310q-3 89 -23 180t-54 184h-815q-35 -94 -55 -185t-22 -179z" />
+<glyph unicode="&#x400;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM303 1820l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x401;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM284 1605v200h219v-200h-219zM754 1605v200h219v-200h-219z" />
+<glyph unicode="&#x402;" horiz-adv-x="1537" d="M41 1301v155h1132v-155h-518v-460q79 22 155 36.5t130 14.5q246 0 383 -121t137 -338q0 -216 -127 -329t-365 -110l-5 2l-2 141q162 0 232 76t70 220q-2 143 -82.5 218.5t-240.5 75.5q-62 0 -138.5 -12.5t-146.5 -33.5v-681h-197v1301h-417z" />
+<glyph unicode="&#x403;" horiz-adv-x="1140" d="M180 0v1456h893v-155h-696v-1301h-197zM536 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x404;" horiz-adv-x="1386" d="M135 599v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-47h562v-154h-562v-60q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175 t-155.5 444z" />
+<glyph unicode="&#x405;" horiz-adv-x="1277" d="M102 413l2 6h188q0 -140 103 -213t255 -73q149 0 236 63t87 171q0 100 -75 167.5t-266 113.5q-231 55 -360.5 162t-129.5 269q0 170 139.5 284t361.5 114q239 0 380.5 -131t136.5 -304l-2 -6h-188q0 128 -84.5 207t-242.5 79q-147 0 -225.5 -66.5t-78.5 -173.5 q0 -95 85 -158.5t276 -111.5q230 -57 350 -168t120 -275q0 -176 -144 -283t-376 -107q-218 0 -385.5 118t-162.5 316z" />
+<glyph unicode="&#x406;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x407;" horiz-adv-x="579" d="M-53 1605v200h219v-200h-219zM190 0v1456h198v-1456h-198zM417 1605v200h219v-200h-219z" />
+<glyph unicode="&#x408;" horiz-adv-x="1130" d="M66 395l2 6h189q0 -135 68.5 -201.5t193.5 -66.5q109 0 178 73.5t69 196.5v1053h197v-1053q0 -195 -123.5 -309.5t-320.5 -114.5q-210 0 -334 106.5t-119 309.5z" />
+<glyph unicode="&#x409;" horiz-adv-x="2201" d="M50 0v154h40q150 0 216 142.5t67 473.5v686h898v-567h359q232 0 361.5 -123.5t129.5 -321.5t-129.5 -321t-361.5 -123h-556v1301h-504l-1 -531q-1 -401 -108.5 -585.5t-358.5 -184.5h-52zM1271 154h359q147 0 220.5 84.5t73.5 207.5q0 121 -73.5 205t-220.5 84h-359v-581 z" />
+<glyph unicode="&#x40a;" horiz-adv-x="2212" d="M180 0v1456h197v-629h708v629h197v-616h360q233 0 361.5 -114t128.5 -302q0 -189 -129 -306.5t-361 -117.5h-557v673h-708v-673h-197zM1282 165h360q147 0 220.5 74t73.5 187q0 112 -73.5 185.5t-220.5 73.5h-360v-520z" />
+<glyph unicode="&#x40b;" horiz-adv-x="1670" d="M66 1301v155h1132v-155h-528v-433q76 20 155 30t184 10q240 0 364.5 -106t124.5 -342v-460h-197v460q0 164 -69.5 228t-222.5 64q-90 0 -173.5 -11t-165.5 -31v-710h-197v1301h-407z" />
+<glyph unicode="&#x40c;" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197zM524 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x40d;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197zM408 1820l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x40e;" horiz-adv-x="1297" d="M85 1456h221l282 -681l73 -188h6l328 869h229l-509 -1217q-59 -131 -128.5 -195.5t-221.5 -64.5q-25 0 -58.5 3t-42.5 6l5 149q10 -2 43.5 -3t50.5 -1q71 0 101.5 36t68.5 116l40 84zM352 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6 q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x40f;" horiz-adv-x="1463" d="M180 0v1456h197v-1302h708v1302h197v-1456h-445v-359h-197v359h-460z" />
+<glyph unicode="&#x410;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x411;" horiz-adv-x="1292" d="M163 0v1456h893v-155h-696v-421h359q233 0 362.5 -119.5t129.5 -316.5q0 -198 -130 -321t-362 -123h-556zM360 154h359q147 0 221 84.5t74 207.5q0 119 -73.5 199t-221.5 80h-359v-571z" />
+<glyph unicode="&#x412;" horiz-adv-x="1309" d="M180 0v1456h475q228 0 357 -98.5t129 -295.5q0 -97 -62 -173.5t-163 -113.5q132 -28 207.5 -129t75.5 -235q0 -200 -129.5 -305.5t-351.5 -105.5h-538zM377 154h341q134 0 209 66.5t75 188.5q0 128 -62.5 201t-192.5 73h-370v-529zM377 837h319q110 0 179 60.5t69 168.5 q0 118 -74.5 176.5t-214.5 58.5h-278v-464z" />
+<glyph unicode="&#x413;" horiz-adv-x="1140" d="M180 0v1456h893v-155h-696v-1301h-197z" />
+<glyph unicode="&#x414;" horiz-adv-x="1550" d="M48 154h125q77 87 141 255.5t70 457.5l33 589h876v-1302h200l-20 -511h-177v357h-1051v-359h-167zM392 154h704v1147h-490l-23 -434q-9 -238 -60 -419t-131 -294z" />
+<glyph unicode="&#x415;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966z" />
+<glyph unicode="&#x416;" horiz-adv-x="1869" d="M28 0l487 770l-446 686h230l378 -633h164v633h197v-633h156l378 633h230l-447 -685l487 -771h-245l-406 668h-153v-668h-197v668h-162l-405 -668h-246z" />
+<glyph unicode="&#x417;" horiz-adv-x="1385" d="M125 398l2 6h188q0 -114 99 -192.5t256 -78.5q178 0 279 74.5t101 194.5q0 133 -92 197.5t-272 64.5h-183v156h183q174 0 258 66t84 180q0 112 -90.5 184t-267.5 72q-141 0 -237.5 -71t-96.5 -176h-188l-1 6q-6 176 146.5 286t376.5 110q257 0 406 -108t149 -307 q0 -101 -68 -184.5t-188 -130.5q135 -42 206.5 -129t71.5 -212q0 -201 -159.5 -314t-417.5 -113q-226 0 -388 107t-157 312z" />
+<glyph unicode="&#x418;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197z" />
+<glyph unicode="&#x419;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197zM439 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x41a;" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197z" />
+<glyph unicode="&#x41b;" horiz-adv-x="1451" d="M49 0v154h41q138 0 199 142.5t62 473.5l1 686h919v-1456h-197v1301h-526l-1 -531q0 -400 -103 -585t-342 -185h-53z" />
+<glyph unicode="&#x41c;" horiz-adv-x="1799" d="M180 0v1456h252l464 -1183h6l464 1183h252v-1456h-197v576l20 592l-5 1l-472 -1169h-131l-470 1166l-5 -1l19 -589v-576h-197z" />
+<glyph unicode="&#x41d;" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197z" />
+<glyph unicode="&#x41e;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261z" />
+<glyph unicode="&#x41f;" horiz-adv-x="1463" d="M180 0v1456h1103v-1456h-198v1301h-708v-1301h-197z" />
+<glyph unicode="&#x420;" horiz-adv-x="1312" d="M180 0v1456h557q233 0 362 -120t129 -316q0 -199 -129 -317.5t-362 -118.5h-360v-584h-197zM377 738h360q148 0 221 79.5t73 200.5t-73.5 202t-220.5 81h-360v-563z" />
+<glyph unicode="&#x421;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444z" />
+<glyph unicode="&#x422;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467z" />
+<glyph unicode="&#x423;" horiz-adv-x="1287" d="M85 1456h221l282 -681l73 -188h6l328 869h229l-509 -1217q-59 -131 -128.5 -195.5t-221.5 -64.5q-25 0 -58.5 3t-42.5 6l5 149q10 -2 43.5 -3t50.5 -1q71 0 101.5 36t68.5 116l40 84z" />
+<glyph unicode="&#x424;" horiz-adv-x="1591" d="M85 723q0 257 168.5 422.5t420.5 165.5h29v205h197v-205h26q252 0 421.5 -164.5t169.5 -421.5q0 -259 -169.5 -424t-421.5 -165h-26v-196h-197v196h-29q-253 0 -421 164t-168 423zM280 723q0 -201 102.5 -317t291.5 -116h29v866h-29q-189 0 -291.5 -117t-102.5 -316z M900 290h28q186 0 289.5 117t103.5 318q0 198 -103.5 314.5t-289.5 116.5h-28v-866z" />
+<glyph unicode="&#x425;" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238z" />
+<glyph unicode="&#x426;" horiz-adv-x="1576" d="M181 0v1456h198v-1301h708v1301h197v-1456h-1103zM1299 160h197v-519h-197v519z" />
+<glyph unicode="&#x427;" horiz-adv-x="1409" d="M147 996v460h198v-460q0 -165 69 -228.5t222 -63.5q104 0 200 14t195 41v697h197v-1456h-197v603q-95 -29 -184 -42t-211 -13q-241 0 -365 105.5t-124 342.5z" />
+<glyph unicode="&#x428;" horiz-adv-x="1932" d="M180 0v1456h197v-1302h492v1302h196v-1302h490v1302h197v-1456h-1572z" />
+<glyph unicode="&#x429;" horiz-adv-x="1994" d="M180 0v1456h197v-1302h492v1302h196v-1302h490v1302h197v-1301h155l-20 -506h-175v351h-1532z" />
+<glyph unicode="&#x42a;" horiz-adv-x="1548" d="M22 1301v155h595v-596h359q234 0 363 -115t129 -311t-129.5 -315t-362.5 -119h-556v1301h-398zM617 154h359q148 0 221.5 80t73.5 202q0 118 -73.5 193.5t-221.5 75.5h-359v-551z" />
+<glyph unicode="&#x42b;" horiz-adv-x="1782" d="M180 0v1456h197v-576h359q233 0 362.5 -119.5t129.5 -316.5q0 -198 -130 -321t-362 -123h-556zM377 154h359q147 0 221 84.5t74 207.5q0 119 -73.5 199t-221.5 80h-359v-571zM1405 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x42c;" horiz-adv-x="1290" d="M163 0v1456h197v-596h359q234 0 363 -115t129 -311t-129.5 -315t-362.5 -119h-556zM360 154h359q148 0 221.5 80t73.5 202q0 118 -73.5 193.5t-221.5 75.5h-359v-551z" />
+<glyph unicode="&#x42d;" horiz-adv-x="1385" d="M186 459l2 6h189q0 -154 89 -242.5t254 -88.5q164 0 262.5 132.5t98.5 330.5v81h-574v155h574v25q0 198 -98.5 331.5t-262.5 133.5q-165 0 -254 -89t-89 -244h-189l-2 6q-5 203 143.5 342.5t390.5 139.5q247 0 403 -175.5t156 -444.5v-259q0 -270 -156 -444.5 t-403 -174.5t-393 130.5t-141 348.5z" />
+<glyph unicode="&#x42e;" horiz-adv-x="1825" d="M190 0v1456h198v-670h205v71q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443v34h-205v-632h-198zM790 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261 q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
+<glyph unicode="&#x42f;" horiz-adv-x="1313" d="M99 0l341 622q-141 54 -214.5 154t-73.5 242q0 208 137.5 323t378.5 115h466v-1456h-197v569h-326l-303 -569h-209zM349 1020q0 -131 82 -213t235 -82h271v576h-269q-156 0 -237.5 -75t-81.5 -206z" />
+<glyph unicode="&#x430;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x431;" horiz-adv-x="1133" d="M97 508v140q0 320 134.5 510t360.5 235q126 23 182.5 55t56.5 105h152l2 -6q3 -176 -83 -231t-273 -87q-136 -23 -233 -105t-119 -241l4 -5q59 63 148 102.5t190 39.5q207 0 327 -137.5t120 -352.5v-22q0 -233 -130 -381t-354 -148t-354.5 148t-130.5 381zM295 508 q0 -163 72 -269t215 -106q141 0 214 106t73 269v22q0 144 -73.5 240t-215.5 96q-141 0 -213 -96t-72 -240v-22z" />
+<glyph unicode="&#x432;" d="M144 0v1082h427q214 0 332 -74.5t118 -223.5q0 -76 -46 -135.5t-130 -90.5q101 -25 157.5 -93.5t56.5 -156.5q0 -152 -110.5 -230t-308.5 -78h-496zM341 152h299q109 0 165 41.5t56 119.5q0 77 -56 119t-165 42h-299v-322zM341 625h231q125 0 188.5 37t63.5 112 q0 77 -64 116t-189 39h-230v-304z" />
+<glyph unicode="&#x433;" horiz-adv-x="849" d="M143 0v1082h688v-156h-491v-926h-197z" />
+<glyph unicode="&#x434;" horiz-adv-x="1247" d="M46 154h85q83 96 127 200.5t59 320.5l16 407h707v-928h144l-19 -472h-178v318h-744v-318h-178zM358 154h485v753h-320l-9 -232q-11 -180 -51.5 -307t-104.5 -214z" />
+<glyph unicode="&#x435;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x436;" horiz-adv-x="1568" d="M21 0l386 573l-352 509h238l266 -446h123v446h197v-446h123l267 446h238l-353 -509l386 -573h-248l-287 469h-126v-469h-197v469h-127l-286 -469h-248z" />
+<glyph unicode="&#x437;" horiz-adv-x="1040" d="M93 314l2 6h187q0 -76 66 -132t170 -56q107 0 166.5 49.5t59.5 123.5q0 87 -51.5 127t-161.5 40h-188v160h188q104 0 149 39.5t45 114.5q0 68 -51.5 115t-155.5 47q-93 0 -156 -49t-63 -119h-187l-2 6q-6 139 113.5 226.5t294.5 87.5q190 0 297 -81.5t107 -232.5 q0 -73 -44 -133.5t-123 -95.5q91 -33 139 -97t48 -155q0 -152 -116.5 -238t-307.5 -86q-176 0 -303 85.5t-122 247.5z" />
+<glyph unicode="&#x438;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196z" />
+<glyph unicode="&#x439;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196zM287 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x43a;" horiz-adv-x="1086" d="M153 0v1082h197v-457h114l357 457h231l3 -5l-424 -513l458 -559l-3 -5h-242l-365 459h-129v-459h-197z" />
+<glyph unicode="&#x43b;" horiz-adv-x="1133" d="M26 0l4 168l41 1q105 0 146.5 102.5t41.5 348.5v462h761v-1082h-197v926h-366v-306q0 -320 -85 -470t-290 -150h-56z" />
+<glyph unicode="&#x43c;" horiz-adv-x="1528" d="M153 0v1082h254l352 -824h6l354 824h246v-1082h-197v751l-6 2l-332 -753h-136l-338 770l-6 -2v-768h-197z" />
+<glyph unicode="&#x43d;" d="M143 0v1082h197v-468h482v468h197v-1082h-197v460h-482v-460h-197z" />
+<glyph unicode="&#x43e;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x43f;" d="M143 0v1082h877v-1082h-197v926h-483v-926h-197z" />
+<glyph unicode="&#x440;" d="M143 -416v1498h151l31 -140q53 78 132 119t184 41q201 0 312.5 -159.5t111.5 -421.5v-21q0 -234 -112 -377.5t-309 -143.5q-100 0 -175.5 33.5t-128.5 100.5v-529h-197zM340 275q37 -67 97 -104.5t147 -37.5q140 0 212 102.5t72 264.5v21q0 184 -72.5 302.5t-213.5 118.5 q-85 0 -145 -38.5t-97 -105.5v-523z" />
+<glyph unicode="&#x441;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387z" />
+<glyph unicode="&#x442;" horiz-adv-x="1048" d="M71 929v153h906v-153h-357v-929h-197v929h-352z" />
+<glyph unicode="&#x443;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113z" />
+<glyph unicode="&#x444;" horiz-adv-x="1485" d="M98 500v21q0 263 102 422t292 159q40 0 75.5 -7t67.5 -19v484h197v-490q34 15 74 23.5t87 8.5q190 0 292 -159t102 -422v-21q0 -236 -102.5 -378.5t-289.5 -142.5q-47 0 -88 8t-75 22v-425h-197v420q-32 -12 -68 -18.5t-77 -6.5q-188 0 -290 142.5t-102 378.5zM295 500 q0 -167 57.5 -267t187.5 -100q27 0 51 3.5t44 10.5v786q-20 6 -43 10t-50 4q-130 0 -188.5 -118t-58.5 -308v-21zM832 147q20 -7 45.5 -10.5t57.5 -3.5q130 0 192.5 101t62.5 266v21q0 188 -63.5 307t-193.5 119q-30 0 -55 -4.5t-46 -12.5v-783z" />
+<glyph unicode="&#x445;" horiz-adv-x="1030" d="M46 0l361 547l-351 535h227l227 -399l230 399h230l-351 -535l361 -547h-226l-240 409l-240 -409h-228z" />
+<glyph unicode="&#x446;" horiz-adv-x="1218" d="M143 0v1082h197v-928h483v928h197v-928h132v-508h-197v354h-812z" />
+<glyph unicode="&#x447;" horiz-adv-x="1131" d="M127 765v318h197v-318q0 -130 56 -191t166 -61q66 0 126 7.5t119 22.5v539h197v-1082h-197v387q-57 -15 -117 -22.5t-128 -7.5q-196 0 -307.5 103t-111.5 305z" />
+<glyph unicode="&#x448;" horiz-adv-x="1645" d="M143 0v1082h197v-928h381v928h197v-928h381v928h197v-1082h-1353z" />
+<glyph unicode="&#x449;" horiz-adv-x="1732" d="M143 0v1082h197v-928h381v928h197v-928h381v928h197v-937h176v-483h-195v338h-1334z" />
+<glyph unicode="&#x44a;" horiz-adv-x="1268" d="M29 927v155h514v-372h269q192 0 298.5 -97.5t106.5 -253.5q0 -157 -107.5 -258t-297.5 -101h-466v927h-317zM543 154h269q106 0 156.5 56.5t50.5 141.5q0 82 -51 143t-156 61h-269v-402z" />
+<glyph unicode="&#x44b;" horiz-adv-x="1617" d="M173 0v1082h197v-412h269q192 0 298.5 -92t106.5 -239q0 -148 -107.5 -243.5t-297.5 -95.5h-466zM370 154h269q106 0 156.5 51t50.5 127q0 74 -51 129t-156 55h-269v-362zM1235 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x44c;" horiz-adv-x="1113" d="M153 0v1082h197v-412h269q192 0 298.5 -92t106.5 -239q0 -148 -107.5 -243.5t-297.5 -95.5h-466zM350 154h269q106 0 156.5 51t50.5 127q0 74 -51 129t-156 55h-269v-362z" />
+<glyph unicode="&#x44d;" horiz-adv-x="1102" d="M104 365l2 6h179q0 -99 67.5 -168.5t167.5 -69.5q126 0 195 98t77 238l-3 5h-385v154h383l2 5q-10 131 -78.5 222.5t-190.5 91.5q-92 0 -163.5 -61t-71.5 -148h-178l-2 6q-6 139 121.5 248.5t293.5 109.5q220 0 347.5 -156.5t127.5 -383.5v-42q0 -228 -128 -384.5 t-347 -156.5q-183 0 -302 111.5t-114 274.5z" />
+<glyph unicode="&#x44e;" horiz-adv-x="1671" d="M153 0v1082h197v-457h256q20 212 147.5 344.5t332.5 132.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154q-210 0 -338.5 136.5t-144.5 355.5h-255v-471h-197zM800 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113 q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x44f;" horiz-adv-x="1163" d="M78 0l274 449q-103 37 -158.5 117t-55.5 185q0 146 110.5 238.5t304.5 92.5h457v-1082h-197v420h-267l-256 -420h-212zM336 749q0 -72 49 -123t147 -51h281v354h-260q-107 0 -162 -53.5t-55 -126.5z" />
+<glyph unicode="&#x450;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM233 1499l3 6h230l175 -266h-158zM307 654l2 -5 h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x451;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM214 1284v200h219v-200h-219zM307 654l2 -5h499 v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM684 1284v200h219v-200h-219z" />
+<glyph unicode="&#x452;" d="M-25 1208v155h168v197h197v-197h276v-155h-276v-271q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-222h1v-545q0 -167 -86 -257.5t-240 -90.5q-33 0 -59 4t-54 13l15 151q13 -5 47 -9t51 -4q60 0 94 51.5t34 141.5v769q0 134 -57.5 198t-171.5 64 q-82 0 -148.5 -38.5t-109.5 -104.5v-799h-197v1208h-168z" />
+<glyph unicode="&#x453;" horiz-adv-x="849" d="M143 0v1082h688v-156h-491v-926h-197zM332 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x454;" horiz-adv-x="1103" d="M107 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-141 0 -208.5 -93.5t-72.5 -231.5l2 -5h376v-154h-376l-2 -5q5 -141 72 -233t209 -92q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5 t-301.5 -108.5q-236 0 -361 154t-125 387z" />
+<glyph unicode="&#x455;" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 42.5t59.5 111.5q0 65 -49.5 107t-187.5 73q-197 43 -296.5 116.5t-99.5 200.5q0 132 112 225t292 93q189 0 300.5 -97t106.5 -236l-2 -6h-188q0 71 -59.5 127.5t-157.5 56.5q-105 0 -156 -46t-51 -111 q0 -64 45 -101t183 -66q205 -44 305 -119.5t100 -202.5q0 -144 -116.5 -233t-304.5 -89q-207 0 -326 105t-113 245z" />
+<glyph unicode="&#x456;" horiz-adv-x="516" d="M159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197z" />
+<glyph unicode="&#x457;" horiz-adv-x="515" d="M-90 1262v200h219v-200h-219zM153 0v1082h197v-1082h-197zM380 1262v200h219v-200h-219z" />
+<glyph unicode="&#x458;" horiz-adv-x="530" d="M-66 -419l14 155q14 -5 40 -8.5t43 -3.5q65 0 103.5 44t38.5 143v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM167 1363v197h197v-197h-197z" />
+<glyph unicode="&#x459;" horiz-adv-x="1782" d="M65 0l4 158l41 1q106 0 152 109t46 352v462h712v-411h269q191 0 298 -92.5t107 -239.5q0 -148 -107.5 -243.5t-297.5 -95.5h-466v926h-318v-306q0 -318 -89 -469t-295 -151h-56zM1020 152h269q105 0 156 56t51 133q0 73 -50.5 124.5t-156.5 51.5h-269v-365z" />
+<glyph unicode="&#x45a;" horiz-adv-x="1781" d="M143 0v1082h197v-408h482v408h197v-412h269q192 0 298.5 -92t106.5 -239q0 -148 -107.5 -243.5t-297.5 -95.5h-466v521h-482v-521h-197zM1019 152h269q105 0 156 56t51 133q0 73 -50.5 124.5t-156.5 51.5h-269v-365z" />
+<glyph unicode="&#x45b;" d="M19 1211v155h124v194h197v-194h320v-155h-320v-274q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-678h-197v680q0 134 -57.5 198t-171.5 64q-82 0 -148.5 -38.5t-109.5 -104.5v-799h-197v1211h-124z" />
+<glyph unicode="&#x45c;" horiz-adv-x="1086" d="M153 0v1082h197v-457h114l357 457h231l3 -5l-424 -513l458 -559l-3 -5h-242l-365 459h-129v-459h-197zM449 1212l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x45d;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196zM256 1477l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x45e;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM220 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189 t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x45f;" d="M143 0v1082h197v-928h483v928h197v-1082h-337v-356h-197v356h-343z" />
+<glyph unicode="&#x460;" horiz-adv-x="1797" d="M157 391v1065h197v-1065q0 -127 55.5 -192.5t147.5 -65.5q108 0 174 65.5t66 192.5v1065h204v-1065q0 -126 61 -192t161 -66q99 0 160 66t61 192v1065h197v-1065q0 -201 -115.5 -306.5t-302.5 -105.5q-109 0 -194 43.5t-132 129.5q-51 -86 -139 -129.5t-201 -43.5 q-180 0 -290 105.5t-110 306.5z" />
+<glyph unicode="&#x461;" horiz-adv-x="1560" d="M124 352v730h197v-730q0 -108 44 -163.5t119 -55.5q89 0 145 56t56 163v730h198v-730q0 -108 49.5 -163.5t132.5 -55.5q81 0 131.5 56t50.5 163v730h197v-730q0 -182 -105 -277.5t-274 -95.5q-93 0 -166 35.5t-117 106.5q-47 -71 -124 -106.5t-174 -35.5 q-163 0 -261.5 95t-98.5 278z" />
+<glyph unicode="&#x462;" horiz-adv-x="1290" d="M-51 1101v155h214v200h197v-200h230v-155h-230v-221h359q233 0 362.5 -119.5t129.5 -316.5q0 -198 -130 -321t-362 -123h-556v1101h-214zM360 154h359q147 0 221 84.5t74 207.5q0 119 -73.5 199t-221.5 80h-359v-571z" />
+<glyph unicode="&#x463;" horiz-adv-x="1113" d="M-37 1082v154h190v324h197v-324h321v-154h-321v-334h269q192 0 298.5 -102.5t106.5 -267.5t-107.5 -271.5t-297.5 -106.5h-466v1082h-190zM350 154h269q106 0 156.5 62.5t50.5 154.5q0 90 -51 156.5t-156 66.5h-269v-440z" />
+<glyph unicode="&#x464;" horiz-adv-x="1837" d="M191 0v1456h198v-622h196v24q0 269 155.5 444.5t402.5 175.5q242 0 379 -128.5t156 -351.5l-2 -6h-189q-24 160 -105 245.5t-239 85.5q-165 0 -263 -133t-98 -330v-26h539v-155h-539v-80q0 -199 98 -332t263 -133q159 0 239.5 85t104.5 248h189l2 -6q-19 -211 -158 -346 t-377 -135q-247 0 -402.5 175t-155.5 444v80h-196v-679h-198z" />
+<glyph unicode="&#x465;" horiz-adv-x="1530" d="M151 0v1082h197v-466h187q14 211 138.5 348.5t345.5 137.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-141 0 -208.5 -93.5t-72.5 -232.5l2 -5h419v-154h-419l-2 -5q5 -140 72 -232t209 -92q98 0 172.5 60.5t74.5 148.5h177l2 -6 q5 -140 -124.5 -248.5t-301.5 -108.5q-221 0 -345 135.5t-139 347.5h-187v-462h-197z" />
+<glyph unicode="&#x466;" horiz-adv-x="1235" d="M43 0l525 1456h169l514 -1456h-201l-149 438h-161v-438h-196v438h-148l-152 -438h-201zM453 602h392l-191 563h-6z" />
+<glyph unicode="&#x467;" horiz-adv-x="1097" d="M13 0l440 1082h169l443 -1082h-201l-119 294h-106v-294h-196v294h-113l-116 -294h-201zM391 449h292l-126 312l-18 68h-6l-18 -68z" />
+<glyph unicode="&#x468;" horiz-adv-x="1805" d="M209 0v1456h198v-853h382l308 853h169l514 -1456h-201l-149 438h-161v-438h-196v438h-148l-152 -438h-201l158 439h-323v-439h-198zM982 602h392l-191 563h-6z" />
+<glyph unicode="&#x469;" horiz-adv-x="1549" d="M186 0v1082h197v-633h259l258 633h169l443 -1082h-201l-119 294h-106v-294h-196v294h-113l-116 -294h-201l119 293h-196v-293h-197zM838 449h292l-126 312l-18 68h-6l-18 -68z" />
+<glyph unicode="&#x46a;" horiz-adv-x="1759" d="M149 0v371q0 234 123.5 338.5t363.5 104.5h37l-391 642h1209l-391 -642h22q239 0 364 -104.5t125 -338.5v-371h-197v371q0 162 -69.5 225t-222.5 63h-116l-25 -42v-617h-197v632l-17 27h-131q-153 0 -221.5 -63t-68.5 -225v-371h-197zM598 1301l284 -487h10l284 487h-578 z" />
+<glyph unicode="&#x46b;" horiz-adv-x="1516" d="M149 0v162q0 226 106 330t311 111l-284 479h158v1h683v-1h123l-285 -479q198 -10 302 -115t104 -326v-162h-198v162q0 163 -59.5 225.5t-191.5 62.5h-47l-11 -19v-431h-197v440l-6 10h-60q-133 0 -192 -62.5t-59 -225.5v-162h-197zM588 927l176 -320l176 320h-352z" />
+<glyph unicode="&#x46c;" horiz-adv-x="2326" d="M190 0v1456h198v-642h852l-391 642h1209l-391 -642q261 0 386 -104.5t125 -338.5v-371h-197v371q0 162 -69.5 225t-222.5 63h-116l-25 -42v-617h-197v632l-17 27h-131q-153 0 -221.5 -63t-68.5 -225v-371h-197v371q0 185 77 289h-405v-660h-198zM1165 1301l284 -487h10 l284 487h-578z" />
+<glyph unicode="&#x46d;" horiz-adv-x="2019" d="M153 0v1082h197v-477h721l-283 477h964l-285 -479q198 -10 302 -115t104 -326v-162h-198v162q0 163 -59.5 225.5t-191.5 62.5h-47l-11 -19v-431h-197v440l-6 10h-60q-133 0 -192 -62.5t-59 -225.5v-162h-197v162q0 184 70 288h-375v-450h-197zM1094 927l176 -320l176 320 h-352z" />
+<glyph unicode="&#x46e;" horiz-adv-x="1061" d="M74 -122q0 129 89.5 193t250.5 64h42q129 0 203.5 74.5t74.5 193.5q0 133 -82 200t-240 67h-143v155h143q154 0 227 63.5t73 177.5q0 102 -71.5 168.5t-208.5 66.5h-304v155h304q211 0 344.5 -106.5t133.5 -287.5q0 -103 -65 -185t-180 -126q129 -41 198 -129t69 -215 q0 -200 -132.5 -313.5t-343.5 -113.5h-50q-76 0 -110.5 -29.5t-34.5 -82.5q0 -70 46.5 -112.5t112.5 -72.5l-79 -127q-111 47 -188.5 129t-78.5 193zM222 1886v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x46f;" horiz-adv-x="986" d="M73 -122q0 129 89.5 193t250.5 64h41q110 0 173.5 45.5t63.5 119.5q0 82 -71.5 122.5t-209.5 40.5h-143v155h143q133 0 196 41.5t63 116.5q0 65 -61.5 107.5t-177.5 42.5h-303v156h303q192 0 314.5 -84t122.5 -226q0 -73 -51.5 -132.5t-142.5 -94.5q105 -33 160.5 -94 t55.5 -147q0 -151 -121.5 -237.5t-313.5 -86.5h-49q-76 0 -110.5 -29.5t-34.5 -82.5q0 -70 47 -113t113 -72l-80 -127q-111 47 -188.5 129t-78.5 193zM150 1542v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph unicode="&#x470;" horiz-adv-x="1416" d="M87 885v571h196v-571q0 -170 82 -275t218 -125l6 1v970h198v-971l6 -2q144 19 230.5 124.5t86.5 277.5v571h197v-571q0 -245 -143 -393.5t-377 -172.5v-319h-198v320q-227 24 -364.5 172t-137.5 393z" />
+<glyph unicode="&#x471;" horiz-adv-x="1440" d="M91 596v486h197v-488q0 -207 84.5 -316.5t228.5 -128.5l6 2v930h198v-932l6 -2q177 23 263 143.5t86 276.5q-3 125 -36 253.5t-89 261.5h207q51 -106 83 -234t32 -281q0 -240 -133 -401t-419 -183v-457h-198v459q-247 25 -381.5 176t-134.5 435z" />
+<glyph unicode="&#x472;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v43h-775v-43zM310 796h775v63q0 200 -108 328 t-290 128q-172 0 -274.5 -128t-102.5 -328v-63z" />
+<glyph unicode="&#x473;" horiz-adv-x="1165" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM301 464q8 -146 79.5 -238.5t201.5 -92.5q128 0 199.5 92.5t79.5 238.5l-2 5h-556zM302 629l2 -5h554l2 5q-11 138 -83 228t-197 90 t-196 -89.5t-82 -228.5z" />
+<glyph unicode="&#x474;" horiz-adv-x="1295" d="M22 1456h214l345 -1074l33 -121h6l33 121l253 805q49 156 114.5 222.5t173.5 66.5l50 -1l-1 -169h-12q-50 0 -80.5 -31.5t-57.5 -111.5l-392 -1163h-169z" />
+<glyph unicode="&#x475;" horiz-adv-x="1031" d="M46 1082h202l235 -763l17 -76h6l19 76l149 535q41 127 107 187t148 60q34 0 59.5 -5t49.5 -20l-22 -151q-5 3 -16 5.5t-24 2.5q-32 0 -61.5 -26t-42.5 -68l-296 -839h-149z" />
+<glyph unicode="&#x476;" horiz-adv-x="1295" d="M22 1456h214l345 -1074l33 -121h6l33 121l253 805q49 156 114.5 222.5t173.5 66.5l50 -1l-1 -169h-12q-50 0 -80.5 -31.5t-57.5 -111.5l-392 -1163h-169zM100 1858l3 6h229l241 -261l-2 -5h-171zM444 1859l2 5h212l184 -266h-157z" />
+<glyph unicode="&#x477;" horiz-adv-x="1031" d="M-2 1562l3 6h229l241 -261l-2 -5h-171zM46 1082h202l235 -763l17 -76h6l19 76l149 535q41 127 107 187t148 60q34 0 59.5 -5t49.5 -20l-22 -151q-5 3 -16 5.5t-24 2.5q-32 0 -61.5 -26t-42.5 -68l-296 -839h-149zM342 1563l2 5h212l184 -266h-157z" />
+<glyph unicode="&#x478;" horiz-adv-x="2426" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM1422 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113z" />
+<glyph unicode="&#x479;" horiz-adv-x="2194" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M1190 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113z" />
+<glyph unicode="&#x47a;" horiz-adv-x="1396" d="M113 598v259q0 266 159 443q132 146 328 171v118h197v-121q190 -30 319 -168q166 -176 166 -443v-259q0 -267 -166 -443q-129 -138 -319 -167v-129h-197v126q-196 25 -328 170q-159 176 -159 443zM310 598q0 -202 102 -330q75 -94 188 -119v108h197v-104q107 28 180 114 q108 128 108 331v261q0 200 -108 328q-73 86 -180 114v-101h-197v106q-113 -25 -188 -119q-102 -128 -102 -328v-261z" />
+<glyph unicode="&#x47b;" d="M97 529v22q0 240 130 395q100 121 257 148v112h197v-113q155 -28 254 -146q131 -155 131 -396v-22q0 -242 -130 -396q-100 -118 -255 -145v-106h-197v105q-156 27 -257 146q-130 155 -130 396zM294 529q0 -172 72 -284q45 -70 118 -97v103h197v-102q70 27 115 96 q73 112 73 284v22q0 170 -74 283q-44 68 -114 95v-93h-197v95q-72 -27 -118 -97q-72 -113 -72 -283v-22z" />
+<glyph unicode="&#x47c;" horiz-adv-x="1790" d="M157 429v576q0 218 109.5 333t284.5 111l6 -2v-146q-92 0 -147.5 -76t-55.5 -220v-576q0 -145 55.5 -220.5t147.5 -75.5q108 0 174 65.5t66 192.5v432h198v-432q0 -127 66 -192.5t175 -65.5q90 0 146.5 75.5t56.5 220.5v576q0 144 -56.5 220t-146.5 76v146l6 2 q174 4 284 -111t110 -333v-576q0 -219 -110.5 -334.5t-289.5 -115.5q-114 0 -202 42.5t-138 127.5q-51 -85 -139 -127.5t-200 -42.5q-180 0 -290 115.5t-110 334.5zM578 1626v36q0 108 62 163t176 55q72 0 218 -62t260 -62h44v-129h-46q-131 0 -280.5 61.5t-191.5 61.5 q-50 0 -79 -27t-29 -79v-18h-134zM773 1384l58 115l-1 140h188v-123l-165 -198z" />
+<glyph unicode="&#x47d;" horiz-adv-x="1560" d="M123 390v291q0 199 98 304t256 101l6 -3v-146q-75 0 -119 -65.5t-44 -190.5v-291q0 -127 44 -192t119 -65q89 0 145 56t56 163v234h197v-234q0 -107 55.5 -163t145.5 -56q74 0 118.5 65t44.5 192v291q0 125 -44.5 190.5t-118.5 65.5v146l6 3q157 4 255.5 -101t98.5 -304 v-291q0 -201 -99 -306t-261 -105q-99 0 -176.5 36t-123.5 108q-47 -72 -124 -108t-175 -36q-163 0 -261.5 105t-98.5 306zM496 1267v36q0 108 62 163t176 55q72 0 218 -62t260 -62h44v-129h-46q-131 0 -280.5 61.5t-191.5 61.5q-50 0 -79 -27t-29 -79v-18h-134zM694 1038 l55 109l-1 126l185 -6v-117l-160 -184z" />
+<glyph unicode="&#x47e;" horiz-adv-x="1798" d="M157 391v1065h197v-1065q0 -127 55.5 -192.5t147.5 -65.5q108 0 174 65.5t66 192.5v1065h204v-1065q0 -126 61 -192t161 -66q99 0 160 66t61 192v1065h197v-1065q0 -201 -115.5 -306.5t-302.5 -105.5q-109 0 -194 43.5t-132 129.5q-51 -86 -139 -129.5t-201 -43.5 q-180 0 -290 105.5t-110 306.5zM469 1688v109h821l1 -109h-331v-126h-178v126h-313z" />
+<glyph unicode="&#x47f;" horiz-adv-x="1561" d="M124 352v730h197v-730q0 -108 44 -163.5t119 -55.5q89 0 145 56t56 163v730h198v-730q0 -108 49.5 -163.5t132.5 -55.5q81 0 131.5 56t50.5 163v730h197v-730q0 -182 -105 -277.5t-274 -95.5q-93 0 -166 35.5t-117 106.5q-47 -71 -124 -106.5t-174 -35.5 q-163 0 -261.5 95t-98.5 278zM380 1348v109h821l3 -109h-333v-128h-178v128h-313z" />
+<glyph unicode="&#x480;" horiz-adv-x="1336" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133h115v-516h-196v368q-215 29 -346 198t-131 415z" />
+<glyph unicode="&#x481;" horiz-adv-x="1099" d="M98 520v42q0 227 127.5 383.5t347.5 156.5q182 0 301 -112t115 -275l-2 -6h-178q0 98 -68.5 168t-167.5 70q-138 0 -208 -115t-70 -270v-42q0 -159 69.5 -273t208.5 -114h106v-516h-197v370q-181 32 -282.5 181t-101.5 352z" />
+<glyph unicode="&#x482;" horiz-adv-x="1282" d="M112 569l71 124l293 -171l202 364l-290 171l73 126l291 -171l185 330h171l-229 -407l293 -171l-75 -124l-288 170l-205 -363l289 -172l-71 -125l-291 170l-181 -320h-174l225 398z" />
+<glyph unicode="&#x483;" horiz-adv-x="1165" d="M212 1189l1 235h544l-1 108l175 -1v-217h-544v-126z" />
+<glyph unicode="&#x484;" horiz-adv-x="1209" d="M251 1303v130h44q113 0 259 62t219 62q113 0 175.5 -55t62.5 -163v-36h-134v18q0 52 -29.5 79t-78.5 27q-43 0 -192.5 -62t-279.5 -62h-46z" />
+<glyph unicode="&#x485;" horiz-adv-x="787" d="M256 1500v123h187l-1 -140l59 -116l-81 -66z" />
+<glyph unicode="&#x486;" horiz-adv-x="847" d="M300 1367l58 116l-1 140h188v-123l-165 -199z" />
+<glyph unicode="&#x488;" horiz-adv-x="2076" d="M64 493q-5 78 51.5 130t152.5 52t152.5 -51.5t52.5 -130.5l-2 -6h-104q0 44 -24 72.5t-75 28.5q-50 0 -73.5 -29t-23.5 -72h-105zM230 -26q-5 78 51.5 130t152.5 52t153 -51.5t53 -130.5l-2 -6h-105q0 44 -24 72.5t-75 28.5q-50 0 -73 -29t-23 -72h-106zM240 996 q-5 79 51.5 130.5t153.5 51.5q96 0 152.5 -51.5t52.5 -130.5l-2 -6h-104q0 43 -24.5 72t-74.5 29t-73.5 -29t-23.5 -72h-106zM813 1273q-5 79 51 130.5t153 51.5q96 0 152.5 -51.5t52.5 -130.5l-2 -6h-104q0 43 -24.5 72t-74.5 29t-73.5 -29t-23.5 -72h-105zM818 -310 q-5 80 51 131t153 51q96 0 152.5 -51t52.5 -131l-2 -6h-104q0 44 -24.5 72.5t-74.5 28.5t-73.5 -28.5t-23.5 -72.5h-105zM1394 -26q-5 78 51.5 130t152.5 52t152.5 -51.5t52.5 -130.5l-2 -6h-104q0 44 -24 72.5t-75 28.5q-50 0 -73.5 -29t-23.5 -72h-105zM1404 996 q-5 78 51.5 130t152.5 52t153 -51.5t53 -130.5l-2 -6h-105q0 44 -24 72.5t-75 28.5q-50 0 -73 -29t-23 -72h-106zM1591 493q-5 78 51.5 130t152.5 52t152.5 -51.5t52.5 -130.5l-2 -6h-104q0 44 -24 72.5t-75 28.5q-50 0 -73.5 -29t-23.5 -72h-105z" />
+<glyph unicode="&#x489;" horiz-adv-x="2008" d="M77 545v98l346 -71v-139l-13 -12zM272 -80l294 200l97 -99l-2 -17l-320 -153zM358 1188l65 69l198 -299l-98 -98l-17 2zM897 -413l70 353h137l11 -14l-122 -339h-96zM897 1140l122 338h96l-70 -352h-136zM1347 1002l2 16l321 153l68 -68q-37 -23 -294 -200zM1388 62 l97 99l17 -2l149 -325l-66 -71zM1587 492v139l13 12l333 -124v-98z" />
+<glyph unicode="&#x48a;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197zM439 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM1178 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x48b;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196zM287 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM917 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x48c;" horiz-adv-x="1290" d="M-51 1101v155h214v200h197v-200h230v-155h-230v-221h359q233 0 362.5 -119.5t129.5 -316.5q0 -198 -130 -321t-362 -123h-556v1101h-214zM360 154h359q147 0 221 84.5t74 207.5q0 119 -73.5 199t-221.5 80h-359v-571z" />
+<glyph unicode="&#x48d;" horiz-adv-x="1113" d="M-37 1301v155h190v194h197v-194h321v-155h-321v-553h269q192 0 298.5 -102.5t106.5 -267.5t-107.5 -271.5t-297.5 -106.5h-466v1301h-190zM350 154h269q106 0 156.5 62.5t50.5 154.5q0 90 -51 156.5t-156 66.5h-269v-440z" />
+<glyph unicode="&#x48e;" horiz-adv-x="1309" d="M180 0v1456h557q233 0 362 -120t129 -316q0 -183 -109 -298l135 -146l-116 -104l-147 160q-106 -48 -254 -48h-360v-584h-197zM377 738h360q78 0 136 22l-108 118l115 104l111 -121q40 67 40 157q0 121 -73.5 202t-220.5 81h-360v-563z" />
+<glyph unicode="&#x48f;" horiz-adv-x="1163" d="M143 -416v1498h169l18 -133q53 74 131 113.5t180 39.5q201 0 312.5 -159.5t111.5 -421.5v-21q0 -224 -103 -365l106 -117l-116 -105l-105 116q-87 -50 -203 -50q-100 0 -175.5 33.5t-128.5 100.5v-529h-197zM340 275q37 -67 97 -104.5t147 -37.5q81 0 139 34l-108 120 l116 105l95 -106q42 90 42 214v21q0 184 -72.5 302.5t-213.5 118.5q-85 0 -145 -38.5t-97 -105.5v-523z" />
+<glyph unicode="&#x490;" horiz-adv-x="1124" d="M163 0v1456h700v334h197v-489h-700v-1301h-197z" />
+<glyph unicode="&#x491;" horiz-adv-x="915" d="M143 0v1082h496v315h197v-471h-496v-926h-197z" />
+<glyph unicode="&#x492;" horiz-adv-x="1140" d="M-4 681v155h184v620h893v-155h-696v-465h260v-155h-260v-681h-197v681h-184z" />
+<glyph unicode="&#x493;" horiz-adv-x="849" d="M-13 476v155h156v451h688v-156h-491v-295h288v-155h-288v-476h-197v476h-156z" />
+<glyph unicode="&#x494;" horiz-adv-x="1254" d="M180 0v1456h893v-155h-696v-468h180q284 0 442 -153.5t158 -424.5q0 -263 -121.5 -403t-348.5 -136l-6 2l-2 142q151 0 216 102t65 293q-2 202 -102 307.5t-301 105.5h-180v-668h-197z" />
+<glyph unicode="&#x495;" horiz-adv-x="1032" d="M143 0v1082h688v-156h-491v-279h111q226 0 368.5 -128.5t142.5 -348.5q-2 -138 -99 -278.5t-287 -175.5l-52 149q129 34 185 112.5t56 192.5q-2 147 -87.5 229.5t-226.5 82.5h-111v-482h-197z" />
+<glyph unicode="&#x496;" horiz-adv-x="1869" d="M28 0l487 770l-446 686h230l378 -633h164v633h197v-633h156l378 633h230l-447 -685l487 -771h-245l-406 668h-153v-668h-197v668h-162l-405 -668h-246zM1716 157h197v-516h-197v516z" />
+<glyph unicode="&#x497;" horiz-adv-x="1568" d="M21 0l386 573l-352 509h238l266 -446h123v446h197v-446h123l267 446h238l-353 -509l386 -573h-248l-287 469h-126v-469h-197v469h-127l-286 -469h-248zM1379 157h197v-516h-197v516z" />
+<glyph unicode="&#x498;" horiz-adv-x="1215" d="M125 398l2 6h188q0 -114 99 -192.5t256 -78.5q178 0 279 74.5t101 194.5q0 133 -92 197.5t-272 64.5h-183v156h183q174 0 258 66t84 180q0 112 -90.5 184t-267.5 72q-141 0 -237.5 -71t-96.5 -176h-188l-1 6q-6 176 146.5 286t376.5 110q257 0 406 -108t149 -307 q0 -101 -68 -184.5t-188 -130.5q135 -42 206.5 -129t71.5 -212q0 -201 -159.5 -314t-417.5 -113q-226 0 -388 107t-157 312zM507 86h197v-516h-197v516z" />
+<glyph unicode="&#x499;" horiz-adv-x="1040" d="M93 314l2 6h187q0 -76 66 -132t170 -56q107 0 166.5 49.5t59.5 123.5q0 87 -51.5 127t-161.5 40h-188v160h188q104 0 149 39.5t45 114.5q0 68 -51.5 115t-155.5 47q-93 0 -156 -49t-63 -119h-187l-2 6q-6 139 113.5 226.5t294.5 87.5q190 0 297 -81.5t107 -232.5 q0 -73 -44 -133.5t-123 -95.5q91 -33 139 -97t48 -155q0 -152 -116.5 -238t-307.5 -86q-176 0 -303 85.5t-122 247.5zM421 87h197v-516h-197v516z" />
+<glyph unicode="&#x49a;" horiz-adv-x="1317" d="M180 0v1456h197v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197zM1185 157h197v-516h-197v516z" />
+<glyph unicode="&#x49b;" horiz-adv-x="1086" d="M153 0v1082h197v-457h114l357 457h231l3 -5l-424 -513l458 -559l-3 -5h-242l-365 459h-129v-459h-197zM941 157h197v-516h-197v516z" />
+<glyph unicode="&#x49c;" horiz-adv-x="1295" d="M163 0v1456h197v-644h98v255h157v-255h76l317 644h229l-398 -689l440 -767h-246l-340 658h-78v-243h-157v243h-98v-658h-197z" />
+<glyph unicode="&#x49d;" horiz-adv-x="1128" d="M153 0v1082h197v-457h75v211h157v-211h15l255 457h236l-339 -512l374 -570h-249l-269 459h-23v-191h-157v191h-75v-459h-197z" />
+<glyph unicode="&#x49e;" horiz-adv-x="1337" d="M-11 1154v155h211v147h197v-147h233v-155h-233v-342h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197v1154h-211z" />
+<glyph unicode="&#x49f;" horiz-adv-x="1070" d="M-49 1214v155h213v191h197v-191h231v-155h-231v-558h126l296 426h236l-370 -492l423 -590h-232l-351 499h-128v-499h-197v1214h-213z" />
+<glyph unicode="&#x4a0;" horiz-adv-x="1680" d="M67 1301v155h673v-644h152l521 644h218l3 -5l-565 -699l606 -747l-3 -5h-235l-527 657h-170v-657h-197v1301h-476z" />
+<glyph unicode="&#x4a1;" horiz-adv-x="1422" d="M65 926v156h610v-457h114l357 457h231l3 -5l-424 -513l458 -559l-3 -5h-242l-365 459h-129v-459h-197v926h-413z" />
+<glyph unicode="&#x4a2;" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197zM1229 157h197v-516h-197v516z" />
+<glyph unicode="&#x4a3;" d="M143 0v1082h197v-468h482v468h197v-1082h-197v460h-482v-460h-197zM967 157h197v-516h-197v516z" />
+<glyph unicode="&#x4a4;" horiz-adv-x="1988" d="M180 0v1456h197v-658h707v658h830v-155h-633v-1301h-197v643h-707v-643h-197z" />
+<glyph unicode="&#x4a5;" horiz-adv-x="1456" d="M143 0v1082h197v-468h482v468h559v-156h-362v-926h-197v460h-482v-460h-197z" />
+<glyph unicode="&#x4a6;" horiz-adv-x="2099" d="M180 0v1456h1103v-623h114q284 0 442 -153.5t158 -424.5q0 -263 -121.5 -403t-348.5 -136l-6 2l-2 142q151 0 216 102t65 293q-2 202 -102 307.5t-301 105.5h-114v-668h-198v1301h-708v-1301h-197z" />
+<glyph unicode="&#x4a7;" horiz-adv-x="1786" d="M143 0v1082h877v-435h168q235 0 383 -128.5t148 -348.5q-2 -138 -99 -278.5t-287 -175.5l-52 149q129 34 185 112.5t56 192.5q-2 148 -93 230t-241 82h-168v-482h-197v926h-483v-926h-197z" />
+<glyph unicode="&#x4a8;" horiz-adv-x="1518" d="M113 677v166q0 271 126 451t323 175l6 -2v-152q-119 0 -188.5 -132.5t-69.5 -337.5v-168q0 -235 113.5 -386t304.5 -151q34 0 65.5 3t60.5 10q-122 98 -187.5 238t-65.5 307v227q0 236 114.5 392.5t297.5 156.5q182 0 296 -153.5t114 -395.5v-248q0 -157 -56.5 -291 t-158.5 -229q51 -14 107.5 -20.5t119.5 -6.5v-160q-109 0 -208.5 18.5t-187.5 55.5q-70 -32 -148 -48.5t-163 -16.5q-273 0 -444 199t-171 499zM798 696q0 -153 58.5 -270.5t169.5 -185.5h6q92 67 143 181.5t51 255.5v251q0 172 -57.5 279t-155.5 107t-156.5 -110 t-58.5 -276v-232z" />
+<glyph unicode="&#x4a9;" horiz-adv-x="1239" d="M108 570v57q0 205 97.5 338.5t249.5 128.5l6 -2v-151q-72 0 -114 -87.5t-42 -224.5v-59q0 -188 80 -309t216 -121q22 0 43.5 2.5t42.5 8.5q-93 79 -142 187t-49 235v103q0 189 86.5 308t232.5 119q145 0 233 -127t88 -321v-105q0 -111 -33 -208.5t-93 -172.5 q38 -11 82 -16t93 -5v-160q-90 0 -170.5 14t-150.5 43q-59 -33 -125 -49.5t-138 -16.5q-218 0 -355.5 168.5t-137.5 422.5zM693 571q0 -102 37.5 -183t107.5 -132l6 1q45 49 70 125.5t25 167.5v108q0 123 -33 203t-88 75h-6q-57 5 -88 -66.5t-31 -191.5v-107z" />
+<glyph unicode="&#x4aa;" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5t393 -131.5t142 -348.5l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6q4 -205 -144 -343t-391 -138q-247 0 -402.5 175t-155.5 444zM581 86 h197v-516h-197v516z" />
+<glyph unicode="&#x4ab;" horiz-adv-x="1087" d="M97 520v42q0 231 125.5 385.5t360.5 154.5q190 0 310.5 -112t116.5 -275l-2 -6h-178q0 99 -70 168.5t-177 69.5q-155 0 -221.5 -111.5t-66.5 -273.5v-42q0 -166 66 -276.5t222 -110.5q98 0 172.5 60.5t74.5 148.5h177l2 -6q5 -140 -124.5 -248.5t-301.5 -108.5 q-236 0 -361 154t-125 387zM440 86h197v-516h-197v516z" />
+<glyph unicode="&#x4ac;" horiz-adv-x="1200" d="M34 1301v155h1132v-155h-468v-1301h-197v1301h-467zM646 157h197v-516h-197v516z" />
+<glyph unicode="&#x4ad;" horiz-adv-x="1048" d="M71 929v153h906v-153h-357v-929h-197v929h-352zM568 157h197v-516h-197v516z" />
+<glyph unicode="&#x4ae;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525z" />
+<glyph unicode="&#x4af;" horiz-adv-x="1031" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-375 -1020v-479h-197v484z" />
+<glyph unicode="&#x4b0;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-419 -774h120v-155h-204l-8 -15v-512h-196v525l-1 2h-232v155h148z" />
+<glyph unicode="&#x4b1;" horiz-adv-x="1031" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-346 -940h199v-155h-228v-404h-197v404h-216v155h188z" />
+<glyph unicode="&#x4b2;" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238zM1067 157h197v-516h-197v516z" />
+<glyph unicode="&#x4b3;" horiz-adv-x="1030" d="M46 0l361 547l-351 535h227l227 -399l230 399h230l-351 -535l361 -547h-226l-240 409l-240 -409h-228zM838 157h197v-516h-197v516z" />
+<glyph unicode="&#x4b4;" horiz-adv-x="1847" d="M55 1299v155h954v-155h-415v-1144h708v1301h197v-1295h193v-516h-197v355h-1099v1299h-341z" />
+<glyph unicode="&#x4b5;" horiz-adv-x="1427" d="M32 928v155h708v-155h-243v-774h483v928h197v-928h132v-508h-197v354h-812v928h-268z" />
+<glyph unicode="&#x4b6;" horiz-adv-x="1409" d="M147 996v460h198v-460q0 -165 69 -228.5t222 -63.5q104 0 200 14t195 41v697h197v-1456h-197v603q-95 -29 -184 -42t-211 -13q-241 0 -365 105.5t-124 342.5zM1176 157h197v-516h-197v516z" />
+<glyph unicode="&#x4b7;" horiz-adv-x="1131" d="M127 765v318h197v-318q0 -130 56 -191t166 -61q66 0 126 7.5t119 22.5v539h197v-1082h-197v387q-57 -15 -117 -22.5t-128 -7.5q-196 0 -307.5 103t-111.5 305zM936 157h197v-516h-197v516z" />
+<glyph unicode="&#x4b8;" horiz-adv-x="1398" d="M147 996v460h198v-460q0 -165 69 -228.5t222 -63.5h4v313h158v-304q19 2 38 5q96 14 195 41v697h197v-1456h-197v603q-95 -29 -184 -42q-24 -4 -49 -7v-238h-158v232h-4q-241 0 -365 105.5t-124 342.5z" />
+<glyph unicode="&#x4b9;" horiz-adv-x="1132" d="M127 765v318h197v-318q0 -130 56 -191q40 -44 109 -57v278h158v-278l25 3q60 8 119 23v539h197v-1082h-197v387q-57 -15 -117 -23q-13 -1 -27 -3v-132h-158v130q-156 13 -251 101q-111 103 -111 305z" />
+<glyph unicode="&#x4ba;" horiz-adv-x="1398" d="M138 0v1456h197v-603q96 27 184.5 41t210.5 14q240 0 364.5 -106t124.5 -342v-460h-198v460q0 164 -69.5 228t-221.5 64q-105 0 -201 -14.5t-194 -41.5v-696h-197z" />
+<glyph unicode="&#x4bb;" horiz-adv-x="1132" d="M148 2v1082h197v-387q57 15 117 22.5t128 7.5q196 0 307.5 -103t111.5 -305v-318h-197v318q0 130 -56 191t-166 61q-66 0 -126 -7.5t-119 -22.5v-539h-197z" />
+<glyph unicode="&#x4bc;" horiz-adv-x="1739" d="M81 1077l2 5h151q0 -93 41.5 -155.5t126.5 -80.5q27 279 195.5 454t401.5 175q283 0 432 -177.5t149 -488.5v-108h-978l-2 -5q-5 -249 118.5 -407t376.5 -158q107 0 184 23t152 61l48 -139q-50 -36 -146 -67.5t-238 -31.5q-330 0 -513.5 198.5t-183.5 525.5v6 q-158 20 -239.5 118t-77.5 252zM603 841l3 -5h777v31q0 206 -90.5 329.5t-293.5 123.5q-171 0 -276 -135t-120 -344z" />
+<glyph unicode="&#x4bd;" horiz-adv-x="1215" d="M-33 867h157q0 -69 22.5 -118t70.5 -74q33 189 162 308t292 119q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5v8q-119 29 -180 116.5 t-61 222.5zM416 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x4be;" horiz-adv-x="1590" d="M81 1077l2 5h151q0 -93 41.5 -155.5t126.5 -80.5q27 279 195.5 454t401.5 175q283 0 432 -177.5t149 -488.5v-108h-978l-2 -5q-5 -249 118.5 -407t376.5 -158q107 0 184 23t152 61l48 -139q-50 -36 -146 -67.5t-238 -31.5q-330 0 -513.5 198.5t-183.5 525.5v6 q-158 20 -239.5 118t-77.5 252zM603 841l3 -5h777v31q0 206 -90.5 329.5t-293.5 123.5q-171 0 -276 -135t-120 -344zM879 91h197v-516h-197v516z" />
+<glyph unicode="&#x4bf;" horiz-adv-x="1215" d="M-33 867h157q0 -69 22.5 -118t70.5 -74q33 189 162 308t292 119q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5v8q-119 29 -180 116.5 t-61 222.5zM416 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM612 93h197v-516h-197v516z" />
+<glyph unicode="&#x4c0;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x4c1;" horiz-adv-x="1869" d="M28 0l487 770l-446 686h230l378 -633h164v633h197v-633h156l378 633h230l-447 -685l487 -771h-245l-406 668h-153v-668h-197v668h-162l-405 -668h-246zM644 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x4c2;" horiz-adv-x="1568" d="M21 0l386 573l-352 509h238l266 -446h123v446h197v-446h123l267 446h238l-353 -509l386 -573h-248l-287 469h-126v-469h-197v469h-127l-286 -469h-248zM490 1521l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x4c3;" horiz-adv-x="1295" d="M163 0v1456h197v-626h128l520 626h222l2 -5l-523 -625q246 -23 381 -173.5t135 -400.5q0 -263 -121.5 -403t-348.5 -136l-6 2l-2 142q151 0 216 102t65 293q-2 202 -102 307t-301 105h-265v-664h-197z" />
+<glyph unicode="&#x4c4;" horiz-adv-x="1120" d="M153 0v1082h197v-457h84l387 457h231l2 -5l-405 -464q184 -30 291.5 -141t107.5 -296q-2 -133 -99 -266.5t-287 -167.5l-51 150q128 32 184.5 104.5t56.5 179.5q-2 144 -91 213.5t-243 69.5h-168v-459h-197z" />
+<glyph unicode="&#x4c5;" horiz-adv-x="1451" d="M49 0v154h41q138 0 199 142.5t62 473.5l1 686h919v-1456h-197v1301h-526l-1 -531q0 -400 -103 -585t-342 -185h-53zM1168 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4c6;" horiz-adv-x="1133" d="M26 0l4 168l41 1q105 0 146.5 102.5t41.5 348.5v462h761v-1082h-197v926h-366v-306q0 -320 -85 -470t-290 -150h-56zM917 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4c7;" horiz-adv-x="1461" d="M180 0v1456h197v-658h706v658h198v-1545q0 -167 -86.5 -257.5t-240.5 -90.5q-31 0 -57.5 4.5t-54.5 13.5l14 150q13 -5 47 -9t51 -4q61 0 95 51.5t34 141.5v732h-706v-643h-197z" />
+<glyph unicode="&#x4c8;" d="M143 0v1082h197v-468h482v468h197v-1171q0 -167 -86.5 -257.5t-239.5 -90.5q-31 0 -57.5 4.5t-54.5 13.5l15 150q13 -5 46.5 -9t50.5 -4q60 0 94.5 51.5t34.5 141.5v549h-482v-460h-197z" />
+<glyph unicode="&#x4c9;" horiz-adv-x="1461" d="M180 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197zM1178 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4ca;" d="M143 0v1082h197v-468h482v468h197v-1082h-197v460h-482v-460h-197zM916 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4cb;" horiz-adv-x="1409" d="M147 996v460h198v-460q0 -165 69 -228.5t222 -63.5q104 0 200 14t195 41v697h197v-1456h-197v603q-95 -29 -184 -42t-211 -13q-241 0 -365 105.5t-124 342.5zM885 157h197v-516h-197v516z" />
+<glyph unicode="&#x4cc;" horiz-adv-x="1131" d="M127 765v318h197v-318q0 -130 56 -191t166 -61q66 0 126 7.5t119 22.5v539h197v-1082h-197v387q-57 -15 -117 -22.5t-128 -7.5q-196 0 -307.5 103t-111.5 305zM644 157h197v-516h-197v516z" />
+<glyph unicode="&#x4cd;" horiz-adv-x="1799" d="M180 0v1456h252l464 -1183h6l464 1183h252v-1456h-197v576l20 592l-5 1l-472 -1169h-131l-470 1166l-5 -1l19 -589v-576h-197zM1515 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4ce;" horiz-adv-x="1528" d="M153 0v1082h254l352 -824h6l354 824h246v-1082h-197v751l-6 2l-332 -753h-136l-338 770l-6 -2v-768h-197zM1262 -296l70 316v163h197v-173l-150 -306h-117z" />
+<glyph unicode="&#x4cf;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x4d0;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM369 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x4d1;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM261 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141 z" />
+<glyph unicode="&#x4d2;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM319 1605v200h219v-200h-219zM420 540h490l-240 663h-6zM789 1605v200h219v-200h-219z" />
+<glyph unicode="&#x4d3;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM211 1283v200h219v-200h-219zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM681 1283v200h219v-200h-219z" />
+<glyph unicode="&#x4d4;" horiz-adv-x="1922" d="M-20 0l880 1456h967v-155h-691l20 -466h590v-155h-584l22 -526h705v-154h-895l-15 350h-557l-202 -350h-240zM525 529h447l-31 710l-5 2z" />
+<glyph unicode="&#x4d5;" horiz-adv-x="1729" d="M58 304q0 158 115 244.5t335 86.5h229v85q0 106 -51.5 166.5t-149.5 60.5q-103 0 -164 -55t-61 -133l-188 18l-2 6q-5 138 109.5 228.5t305.5 90.5q114 0 201.5 -40.5t137.5 -117.5q64 75 151.5 116.5t188.5 41.5q214 0 329.5 -130t115.5 -358v-119h-709l-2 -5 q1 -159 79.5 -258t233.5 -99q103 0 169.5 27.5t144.5 78.5l67 -138q-53 -44 -147 -83t-234 -39q-136 0 -240 48.5t-170 138.5q-56 -79 -167.5 -133t-271.5 -54q-170 0 -262.5 87t-92.5 238zM255 300q0 -74 50 -120.5t147 -46.5q76 0 159 43.5t126 100.5v216h-227 q-120 0 -187.5 -56t-67.5 -137zM953 645l2 -5h508v31q0 122 -60 199t-188 77q-113 0 -182 -84.5t-80 -217.5z" />
+<glyph unicode="&#x4d6;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM334 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph unicode="&#x4d7;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM264 1543l2 6h151q0 -66 34 -107t108 -41 q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x4d8;" horiz-adv-x="1425" d="M89 644v108h1020l2 5q4 248 -120.5 406.5t-376.5 158.5q-108 0 -184.5 -23.5t-150.5 -60.5l-49 139q50 35 145.5 67.5t238.5 32.5q330 0 514.5 -199.5t184.5 -525.5v-49q0 -316 -175 -520t-427 -204q-304 0 -463 176.5t-159 488.5zM286 586q0 -207 99.5 -330t325.5 -123 q170 0 275 134.5t122 344.5l-3 5h-819v-31z" />
+<glyph unicode="&#x4d9;" horiz-adv-x="1090" d="M116 464v123h702l3 5q-3 156 -79 256.5t-213 100.5q-100 0 -175.5 -28.5t-130.5 -78.5l-77 128q58 57 153 95t230 38q226 0 359.5 -150.5t133.5 -390.5v-44q0 -231 -137.5 -384.5t-325.5 -153.5q-219 0 -331 132t-112 352zM313 407q0 -116 62 -194t184 -78q99 0 169 83.5 t86 209.5l-2 5h-499v-26z" />
+<glyph unicode="&#x4da;" horiz-adv-x="1425" d="M89 644v108h1020l2 5q4 248 -120.5 406.5t-376.5 158.5q-108 0 -184.5 -23.5t-150.5 -60.5l-49 139q50 35 145.5 67.5t238.5 32.5q330 0 514.5 -199.5t184.5 -525.5v-49q0 -316 -175 -520t-427 -204q-304 0 -463 176.5t-159 488.5zM285 1559v200h219v-200h-219zM286 586 q0 -207 99.5 -330t325.5 -123q170 0 275 134.5t122 344.5l-3 5h-819v-31zM755 1559v200h219v-200h-219z" />
+<glyph unicode="&#x4db;" horiz-adv-x="1090" d="M116 464v123h702l3 5q-3 156 -79 256.5t-213 100.5q-100 0 -175.5 -28.5t-130.5 -78.5l-77 128q58 57 153 95t230 38q226 0 359.5 -150.5t133.5 -390.5v-44q0 -231 -137.5 -384.5t-325.5 -153.5q-219 0 -331 132t-112 352zM224 1283v200h219v-200h-219zM313 407 q0 -116 62 -194t184 -78q99 0 169 83.5t86 209.5l-2 5h-499v-26zM694 1283v200h219v-200h-219z" />
+<glyph unicode="&#x4dc;" horiz-adv-x="1687" d="M28 0l487 770l-446 686h230l378 -633h164v633h197v-633h156l378 633h230l-447 -685l487 -771h-245l-406 668h-153v-668h-197v668h-162l-405 -668h-246zM599 1605v200h219v-200h-219zM1069 1605v200h219v-200h-219z" />
+<glyph unicode="&#x4dd;" horiz-adv-x="1473" d="M21 0l386 573l-352 509h238l266 -446h123v446h197v-446h123l267 446h238l-353 -509l386 -573h-248l-287 469h-126v-469h-197v469h-127l-286 -469h-248zM392 1262v200h219v-200h-219zM862 1262v200h219v-200h-219z" />
+<glyph unicode="&#x4de;" horiz-adv-x="1385" d="M125 398l2 6h188q0 -114 99 -192.5t256 -78.5q178 0 279 74.5t101 194.5q0 133 -92 197.5t-272 64.5h-183v156h183q174 0 258 66t84 180q0 112 -90.5 184t-267.5 72q-141 0 -237.5 -71t-96.5 -176h-188l-1 6q-6 176 146.5 286t376.5 110q257 0 406 -108t149 -307 q0 -101 -68 -184.5t-188 -130.5q135 -42 206.5 -129t71.5 -212q0 -201 -159.5 -314t-417.5 -113q-226 0 -388 107t-157 312zM339 1626v200h219v-200h-219zM809 1626v200h219v-200h-219z" />
+<glyph unicode="&#x4df;" horiz-adv-x="1103" d="M93 314l2 6h187q0 -76 66 -132t170 -56q107 0 166.5 49.5t59.5 123.5q0 87 -51.5 127t-161.5 40h-188v160h188q104 0 149 39.5t45 114.5q0 68 -51.5 115t-155.5 47q-93 0 -156 -49t-63 -119h-187l-2 6q-6 139 113.5 226.5t294.5 87.5q190 0 297 -81.5t107 -232.5 q0 -73 -44 -133.5t-123 -95.5q91 -33 139 -97t48 -155q0 -152 -116.5 -238t-307.5 -86q-176 0 -303 85.5t-122 247.5zM207 1282v200h219v-200h-219zM677 1282v200h219v-200h-219z" />
+<glyph unicode="&#x4e0;" horiz-adv-x="1194" d="M110 398l2 6h189q0 -114 76 -192.5t197 -78.5q139 0 218.5 74.5t79.5 194.5q0 153 -80.5 224.5t-240.5 71.5h-146v154l376 444l-2 5h-631v155h869l1 -120l-409 -491q219 -13 339.5 -126.5t120.5 -312.5q0 -200 -137 -313.5t-358 -113.5q-192 0 -330.5 107t-133.5 312z " />
+<glyph unicode="&#x4e1;" horiz-adv-x="1194" d="M110 23l2 6h189q0 -112 76 -190.5t197 -78.5q139 0 218.5 74.5t79.5 192.5q0 154 -81 225t-241 71h-147v154l357 444l-3 5h-609v156h869l1 -120l-396 -493q214 -16 330.5 -129t116.5 -309q0 -198 -137.5 -312t-357.5 -114q-191 0 -330 107.5t-134 310.5z" />
+<glyph unicode="&#x4e2;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197zM378 1640v146h721v-146h-721z" />
+<glyph unicode="&#x4e3;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196zM226 1299v146h721v-146h-721z" />
+<glyph unicode="&#x4e4;" horiz-adv-x="1461" d="M180 0v1456h197v-1109l6 -2l701 1111h197v-1456h-197v1110l-6 2l-701 -1112h-197zM389 1605v200h219v-200h-219zM859 1605v200h219v-200h-219z" />
+<glyph unicode="&#x4e5;" d="M143 0v1082h196v-768l6 -2l478 770h197v-1082h-197v768l-6 2l-478 -770h-196zM237 1262v200h219v-200h-219zM707 1262v200h219v-200h-219z" />
+<glyph unicode="&#x4e6;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM354 1626v200h219v-200h-219zM824 1626v200h219v-200h-219z" />
+<glyph unicode="&#x4e7;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM238 1283v200h219v-200h-219zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113 q-141 0 -213.5 -113t-72.5 -283v-22zM708 1283v200h219v-200h-219z" />
+<glyph unicode="&#x4e8;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v43h-775v-43zM310 796h775v63q0 200 -108 328 t-290 128q-172 0 -274.5 -128t-102.5 -328v-63z" />
+<glyph unicode="&#x4e9;" horiz-adv-x="1165" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM301 464q8 -146 79.5 -238.5t201.5 -92.5q128 0 199.5 92.5t79.5 238.5l-2 5h-556zM302 629l2 -5h554l2 5q-11 138 -83 228t-197 90 t-196 -89.5t-82 -228.5z" />
+<glyph unicode="&#x4ea;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v43h-775v-43zM310 796h775v63q0 200 -108 328 t-290 128q-172 0 -274.5 -128t-102.5 -328v-63zM376 1600v200h219v-200h-219zM846 1600v200h219v-200h-219z" />
+<glyph unicode="&#x4eb;" horiz-adv-x="1165" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM215 1311v200h219v-200h-219zM301 464q8 -146 79.5 -238.5t201.5 -92.5q128 0 199.5 92.5t79.5 238.5l-2 5h-556zM302 629l2 -5h554l2 5 q-11 138 -83 228t-197 90t-196 -89.5t-82 -228.5zM685 1311v200h219v-200h-219z" />
+<glyph unicode="&#x4ec;" horiz-adv-x="1385" d="M186 459l2 6h189q0 -154 89 -242.5t254 -88.5q164 0 262.5 132.5t98.5 330.5v81h-574v155h574v25q0 198 -98.5 331.5t-262.5 133.5q-165 0 -254 -89t-89 -244h-189l-2 6q-5 203 143.5 342.5t390.5 139.5q247 0 403 -175.5t156 -444.5v-259q0 -270 -156 -444.5 t-403 -174.5t-393 130.5t-141 348.5zM348 1627v200h219v-200h-219zM818 1627v200h219v-200h-219z" />
+<glyph unicode="&#x4ed;" horiz-adv-x="1102" d="M104 365l2 6h179q0 -99 67.5 -168.5t167.5 -69.5q126 0 195 98t77 238l-3 5h-385v154h383l2 5q-10 131 -78.5 222.5t-190.5 91.5q-92 0 -163.5 -61t-71.5 -148h-178l-2 6q-6 139 121.5 248.5t293.5 109.5q220 0 347.5 -156.5t127.5 -383.5v-42q0 -228 -128 -384.5 t-347 -156.5q-183 0 -302 111.5t-114 274.5zM203 1283v200h219v-200h-219zM673 1283v200h219v-200h-219z" />
+<glyph unicode="&#x4ee;" horiz-adv-x="1287" d="M85 1456h221l282 -681l73 -188h6l328 869h229l-509 -1217q-59 -131 -128.5 -195.5t-221.5 -64.5q-25 0 -58.5 3t-42.5 6l5 149q10 -2 43.5 -3t50.5 -1q71 0 101.5 36t68.5 116l40 84zM291 1640v146h721v-146h-721z" />
+<glyph unicode="&#x4ef;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM159 1299v146h721v-146h-721z" />
+<glyph unicode="&#x4f0;" horiz-adv-x="1287" d="M85 1456h221l282 -681l73 -188h6l328 869h229l-509 -1217q-59 -131 -128.5 -195.5t-221.5 -64.5q-25 0 -58.5 3t-42.5 6l5 149q10 -2 43.5 -3t50.5 -1q71 0 101.5 36t68.5 116l40 84zM302 1605v200h219v-200h-219zM772 1605v200h219v-200h-219z" />
+<glyph unicode="&#x4f1;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM170 1262v200h219v-200h-219zM640 1262v200h219v-200h-219z" />
+<glyph unicode="&#x4f2;" horiz-adv-x="1287" d="M85 1456h221l282 -681l73 -188h6l328 869h229l-509 -1217q-59 -131 -128.5 -195.5t-221.5 -64.5q-25 0 -58.5 3t-42.5 6l5 149q10 -2 43.5 -3t50.5 -1q71 0 101.5 36t68.5 116l40 84zM410 1601l184 266h211l2 -5l-240 -261h-157zM679 1606l241 261h229l3 -6l-300 -260 h-171z" />
+<glyph unicode="&#x4f3;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM278 1258l184 266h211l2 -5l-240 -261h-157zM547 1263l241 261h229l3 -6l-300 -260h-171z " />
+<glyph unicode="&#x4f4;" horiz-adv-x="1409" d="M147 996v460h198v-460q0 -165 69 -228.5t222 -63.5q104 0 200 14t195 41v697h197v-1456h-197v603q-95 -29 -184 -42t-211 -13q-241 0 -365 105.5t-124 342.5zM344 1605v200h219v-200h-219zM814 1605v200h219v-200h-219z" />
+<glyph unicode="&#x4f5;" horiz-adv-x="1131" d="M127 765v318h197v-318q0 -130 56 -191t166 -61q66 0 126 7.5t119 22.5v539h197v-1082h-197v387q-57 -15 -117 -22.5t-128 -7.5q-196 0 -307.5 103t-111.5 305zM208 1262v200h219v-200h-219zM678 1262v200h219v-200h-219z" />
+<glyph unicode="&#x4f6;" horiz-adv-x="1140" d="M180 0v1456h893v-155h-696v-1301h-197zM325 157h197v-516h-197v516z" />
+<glyph unicode="&#x4f7;" horiz-adv-x="849" d="M143 0v1082h688v-156h-491v-926h-197zM255 157h197v-516h-197v516z" />
+<glyph unicode="&#x4f8;" horiz-adv-x="1782" d="M180 0v1456h197v-596h359q234 0 363 -115t129 -311t-129.5 -315t-362.5 -119h-556zM377 154h359q148 0 221.5 80t73.5 202q0 118 -73.5 193.5t-221.5 75.5h-359v-551zM548 1605v200h219v-200h-219zM1018 1605v200h219v-200h-219zM1405 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x4f9;" horiz-adv-x="1617" d="M173 0v1082h197v-412h269q192 0 298.5 -92t106.5 -239q0 -148 -107.5 -243.5t-297.5 -95.5h-466zM370 154h269q106 0 156.5 51t50.5 127q0 74 -51 129t-156 55h-269v-362zM460 1262v200h219v-200h-219zM930 1262v200h219v-200h-219zM1235 0v1082h197v-1082h-197z" />
+<glyph unicode="&#x4fa;" horiz-adv-x="1215" d="M65 711v155h641v-155h-641zM196 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM256 0v1456h893v-155h-696v-1301h-197z" />
+<glyph unicode="&#x4fb;" horiz-adv-x="841" d="M66 537v155h641v-155h-641zM180 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM241 0v1082h688v-156h-491v-926h-197z" />
+<glyph unicode="&#x4fc;" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238zM879 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x4fd;" horiz-adv-x="1030" d="M46 0l361 547l-351 535h227l227 -399l230 399h230l-351 -535l361 -547h-226l-240 409l-240 -409h-228zM650 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x4fe;" horiz-adv-x="1295" d="M66 0l429 667h-155v155h141l-405 634h236l338 -568l340 568h238l-406 -634h159v-155h-172l429 -667h-235l-349 578l-350 -578h-238z" />
+<glyph unicode="&#x4ff;" horiz-adv-x="1030" d="M46 0l315 478h-178v155h167l-294 449h227l227 -399l230 399h230l-295 -449h149v-155h-160l316 -478h-226l-240 409l-240 -409h-228z" />
+<glyph unicode="&#x500;" horiz-adv-x="1287" d="M91 444q0 197 128.5 316.5t362.5 119.5h359v576h197v-1456h-556q-233 0 -362 123t-129 321zM288 446q0 -123 73 -207.5t221 -84.5h359v571h-359q-148 0 -221 -80t-73 -199z" />
+<glyph unicode="&#x501;" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v595h197v-1560h-161l-23 133q-53 -76 -130 -115t-179 -39q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q88 0 148 40t98 112v505q-38 67 -98.5 106.5t-145.5 39.5 q-142 0 -209.5 -117t-67.5 -304v-21z" />
+<glyph unicode="&#x502;" horiz-adv-x="1700" d="M91 444q0 197 128.5 316.5t362.5 119.5h359v576h197v-1303l83 1q106 1 164 71.5t62 196.5q1 77 -14.5 160.5t-45.5 162.5h190q33 -100 51 -175.5t16 -147.5q-4 -204 -125.5 -313t-297.5 -109h-639q-233 0 -362 123t-129 321zM288 446q0 -123 73 -207.5t221 -84.5h359v571 h-359q-148 0 -221 -80t-73 -199z" />
+<glyph unicode="&#x503;" horiz-adv-x="1765" d="M98 500v21q0 261 111.5 421t312.5 160q89 0 159 -31t122 -90v579h197v-1215q-2 -95 44 -153.5t123 -58.5q134 1 208 106t78 290q1 97 -14.5 198.5t-45.5 203.5l190 1q33 -122 51 -216.5t16 -186.5q-4 -266 -142 -408t-341 -142q-120 -2 -201.5 40.5t-122.5 135.5 q-53 -87 -133.5 -131.5t-189.5 -44.5q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q84 0 142 36.5t97 102.5q-3 15 -4.5 32t-1.5 35v472q-39 58 -96 91.5t-135 33.5q-142 0 -209.5 -117t-67.5 -304v-21z" />
+<glyph unicode="&#x504;" horiz-adv-x="1623" d="M54 1301v155h359q239 0 365.5 -106t126.5 -307q0 -113 -58.5 -195.5t-169.5 -131.5q118 -40 170.5 -128t52.5 -216v-68q-1 -76 38.5 -123.5t106.5 -47.5q116 1 180 107t68 289q1 97 -14.5 199t-45.5 204h190q34 -134 51 -223.5t16 -179.5q-4 -265 -131 -407.5 t-314 -142.5q-160 -3 -247 75.5t-95 249.5v66q0 118 -68.5 190.5t-184.5 72.5h-191v155h136q166 0 239.5 63t73.5 194q0 121 -71.5 188.5t-223.5 67.5h-359z" />
+<glyph unicode="&#x505;" horiz-adv-x="1324" d="M49 1082h268q206 0 319 -85t113 -237q0 -81 -48 -138t-141 -93q99 -28 143.5 -89t44.5 -150v-77q-1 -42 18.5 -64t66.5 -22q106 2 164.5 78.5t62.5 213.5q1 76 -15 158t-46 161h190q34 -102 52 -175t16 -144q-5 -215 -126 -330t-298 -115q-138 -3 -207 54t-75 186v75 q0 71 -53 110.5t-151 39.5h-211l-2 154h184q119 0 175.5 41.5t56.5 118.5q0 81 -57 128.5t-176 47.5h-262z" />
+<glyph unicode="&#x506;" horiz-adv-x="1099" d="M80 1301v155h274q239 0 365 -106t126 -309q0 -112 -58.5 -195t-169.5 -131q119 -40 171.5 -128t52.5 -216v-136v-16h136v-173l-150 -306h-117l57 260h-61q-41 35 -51.5 100.5t-10.5 136.5v132q0 118 -68.5 190.5t-184.5 72.5h-220v154h162q167 0 241.5 63.5t74.5 193.5 q0 122 -71.5 190t-223.5 68h-274z" />
+<glyph unicode="&#x507;" horiz-adv-x="1033" d="M123 929v153h280q205 0 317.5 -84.5t112.5 -237.5q0 -81 -48.5 -139t-142.5 -94q102 -29 146.5 -95t44.5 -163v-70h128v-173l-150 -306h-117l62 280h-63q-37 23 -47 72.5t-10 100.5v95q0 80 -53 125.5t-151 45.5h-239v154h210q120 0 176 41.5t56 119.5q0 81 -56.5 128 t-175.5 47h-280z" />
+<glyph unicode="&#x508;" horiz-adv-x="1986" d="M69 0v154h41q149 0 215.5 144t66.5 470v688h865v-1111q-1 -95 44.5 -153.5t122.5 -58.5q135 1 208.5 106t77.5 290q1 97 -14.5 198.5t-45.5 203.5l190 1q33 -122 51 -216.5t16 -186.5q-4 -266 -142 -408t-341 -142q-170 -3 -263 85.5t-101 280.5v956h-472v-533 q0 -398 -108 -583t-358 -185h-53z" />
+<glyph unicode="&#x509;" horiz-adv-x="1654" d="M65 0l4 168l41 1q107 0 153 106t46 347v460h701v-737q-1 -95 44 -153.5t121 -58.5q107 1 165 94.5t62 257.5q1 92 -15 188t-46 193h191q33 -120 51 -207.5t16 -173.5q-4 -244 -125.5 -375t-298.5 -131q-168 -3 -261 85.5t-101 280.5v581h-307v-304q0 -317 -89 -469.5 t-295 -152.5h-57z" />
+<glyph unicode="&#x50a;" horiz-adv-x="2051" d="M169 0v1456h197v-658h703v658h197v-1111q-1 -95 44 -153.5t122 -58.5q135 1 209 106t78 290q1 97 -15 198t-46 204l190 1q34 -124 52 -217.5t16 -185.5q-5 -266 -143 -408t-341 -142q-169 -3 -262 85.5t-101 280.5v298h-703v-643h-197z" />
+<glyph unicode="&#x50b;" horiz-adv-x="1698" d="M143 0v1082h197v-469h492v469h197v-737q-1 -95 44.5 -153.5t121.5 -58.5q106 1 164.5 94.5t62.5 257.5q1 91 -14.5 187.5t-45.5 193.5h189q34 -123 52 -209t16 -172q-4 -244 -125 -375t-299 -131q-169 -3 -262 85.5t-101 280.5v115h-492v-460h-197z" />
+<glyph unicode="&#x50c;" horiz-adv-x="1271" d="M118 597v262q0 267 161.5 442.5t417.5 175.5q113 0 202 -22.5t157 -65.5l-63 -135q-67 33 -139 50.5t-157 17.5q-175 0 -278.5 -133t-103.5 -328v-264q0 -198 103.5 -331t278.5 -133q136 1 210 78t78 214q1 83 -12.5 173.5t-37.5 187.5h190q42 -197 50 -240t7 -121 q-4 -216 -142.5 -331t-342.5 -115q-256 0 -417.5 175t-161.5 443z" />
+<glyph unicode="&#x50d;" horiz-adv-x="1054" d="M98 520v42q0 226 127.5 383t346.5 157q94 0 165 -17.5t118 -48.5l-46 -147q-47 27 -108 42.5t-129 15.5q-137 0 -207 -115.5t-70 -269.5v-42q0 -158 74.5 -272.5t223.5 -114.5q95 1 134 42.5t42 125.5q0 58 -5 119t-14 117h189q13 -68 20 -125.5t7 -110.5 q-4 -158 -106 -240t-267 -82q-230 0 -362.5 157t-132.5 384z" />
+<glyph unicode="&#x50e;" horiz-adv-x="1454" d="M36 1301v155h1152v-155h-483v-956q-1 -95 44.5 -153.5t121.5 -58.5q135 1 209.5 106t78.5 290q1 96 -15 197t-47 205l191 1q34 -124 51.5 -217.5t15.5 -185.5q-4 -266 -142 -408t-342 -142q-169 -3 -262 85.5t-101 280.5v956h-472z" />
+<glyph unicode="&#x50f;" horiz-adv-x="1313" d="M70 929v153h907v-153h-356v-584q-1 -95 44 -153.5t122 -58.5q106 1 164.5 78.5t62.5 214.5q1 76 -15 159.5t-45 163.5h189q34 -103 52 -177t16 -146q-4 -216 -125.5 -331.5t-298.5 -115.5q-169 -3 -262 85.5t-101 280.5v584h-354z" />
+<glyph unicode="&#x510;" horiz-adv-x="1385" d="M156 406q0 126 71 212.5t206 128.5q-120 48 -187.5 131t-67.5 184q0 199 149 307t406 108q223 0 376 -110t148 -286l-1 -6h-188q0 105 -97.5 176t-237.5 71q-178 0 -268 -72t-90 -184q0 -114 83.5 -180t258.5 -66h184v-156h-184q-181 0 -272.5 -64.5t-91.5 -197.5 q0 -120 101 -194.5t279 -74.5q156 0 255.5 78.5t99.5 192.5h188l2 -6q4 -205 -158 -312t-387 -107q-258 0 -417.5 113.5t-159.5 313.5z" />
+<glyph unicode="&#x511;" horiz-adv-x="1103" d="M98 305q0 91 51.5 155t150.5 96q-87 35 -135 96t-48 134q0 150 116.5 232t317.5 82q183 0 307.5 -87.5t119.5 -226.5l-2 -6h-186q0 70 -69.5 119t-169.5 49q-116 0 -176.5 -47.5t-60.5 -114.5q0 -74 54.5 -116.5t169.5 -42.5h209v-150h-209q-121 0 -181.5 -42.5 t-60.5 -129.5q0 -73 68.5 -123t186.5 -50q112 0 184.5 56t72.5 132h186l2 -6q5 -162 -128 -247.5t-317 -85.5q-202 0 -327.5 86.5t-125.5 237.5z" />
+<glyph unicode="&#x512;" horiz-adv-x="1451" d="M49 0v154h41q138 0 199 142.5t62 473.5l1 686h919v-1456h-197v1301h-526l-1 -531q0 -400 -103 -585t-342 -185h-53zM1031 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x513;" horiz-adv-x="1133" d="M26 0l4 168l41 1q105 0 146.5 102.5t41.5 348.5v462h761v-1082h-197v926h-366v-306q0 -320 -85 -470t-290 -150h-56zM780 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x1e00;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM523 -234q0 65 45.5 107.5t111.5 42.5q63 0 108 -42.5t45 -107.5q0 -63 -44.5 -104t-108.5 -41q-66 0 -111.5 41t-45.5 104zM612 -234q0 -26 20 -45t48 -19q26 0 45 18.5 t19 45.5q0 30 -19 49.5t-45 19.5q-28 0 -48 -20t-20 -49z" />
+<glyph unicode="&#x1e01;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM338 -234q0 65 45.5 107.5t111.5 42.5q63 0 108 -42.5t45 -107.5q0 -63 -44.5 -104t-108.5 -41q-66 0 -111.5 41t-45.5 104z M427 -234q0 -26 20 -45t48 -19q26 0 45 18.5t19 45.5q0 30 -19 49.5t-45 19.5q-28 0 -48 -20t-20 -49z" />
+<glyph unicode="&#x1e3e;" horiz-adv-x="1799" d="M180 0v1456h252l464 -1183h6l464 1183h252v-1456h-197v576l20 592l-5 1l-472 -1169h-131l-470 1166l-5 -1l19 -589v-576h-197zM809 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1e3f;" horiz-adv-x="1790" d="M143 0v1082h176l14 -142q53 77 134.5 119.5t189.5 42.5t185.5 -50t116.5 -150q51 92 135 146t196 54q165 0 261 -113.5t96 -341.5v-647h-197v649q0 160 -55 226.5t-164 66.5q-101 0 -163.5 -70t-73.5 -177v-8v-687h-198v649q0 152 -56.5 222.5t-162.5 70.5 q-90 0 -148 -37t-89 -104v-801h-197zM826 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1e80;" horiz-adv-x="1809" d="M54 1456h196l222 -952l27 -182l6 -1l39 183l267 952h174l269 -952l40 -187h6l29 187l217 952h197l-351 -1456h-176l-287 1010l-26 131h-6l-25 -131l-292 -1010h-176zM573 1820l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x1e81;" horiz-adv-x="1550" d="M45 1082h196l179 -688l23 -131h6l28 131l216 688h158l217 -688l31 -146h6l29 146l170 688h196l-314 -1082h-159l-209 659l-45 184l-6 -1l-43 -183l-206 -659h-159zM448 1477l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x1e82;" horiz-adv-x="1809" d="M54 1456h196l222 -952l27 -182l6 -1l39 183l267 952h174l269 -952l40 -187h6l29 187l217 952h197l-351 -1456h-176l-287 1010l-26 131h-6l-25 -131l-292 -1010h-176zM808 1556l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1e83;" horiz-adv-x="1550" d="M45 1082h196l179 -688l23 -131h6l28 131l216 688h158l217 -688l31 -146h6l29 146l170 688h196l-314 -1082h-159l-209 659l-45 184l-6 -1l-43 -183l-206 -659h-159zM683 1213l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1e84;" horiz-adv-x="1809" d="M54 1456h196l222 -952l27 -182l6 -1l39 183l267 952h174l269 -952l40 -187h6l29 187l217 952h197l-351 -1456h-176l-287 1010l-26 131h-6l-25 -131l-292 -1010h-176zM554 1605v200h219v-200h-219zM1024 1605v200h219v-200h-219z" />
+<glyph unicode="&#x1e85;" horiz-adv-x="1550" d="M45 1082h196l179 -688l23 -131h6l28 131l216 688h158l217 -688l31 -146h6l29 146l170 688h196l-314 -1082h-159l-209 659l-45 184l-6 -1l-43 -183l-206 -659h-159zM429 1262v200h219v-200h-219zM899 1262v200h219v-200h-219z" />
+<glyph unicode="&#x1ea0;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM554 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ea1;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM398 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ea2;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM420 540h490l-240 663h-6zM579 1884l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ea3;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM469 1562l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53 q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ea4;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM299 1603l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM420 540h490l-240 663h-6zM965 1773l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ea5;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM181 1281l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM847 1451l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ea6;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM25 2016h210l140 -260h-147zM306 1586l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x1ea7;" horiz-adv-x="1126" d="M-93 1694h210l140 -260h-147zM106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5 t-6.5 75.5q-55 -78 -143.5 -130.5t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM188 1264l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x1ea8;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM298 1566l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM420 540h490l-240 663h-6zM991 1959l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133 q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1ea9;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM180 1246l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM873 1639l6 94q127 0 195.5 -43.5t68.5 -118.5 q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1eaa;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM296 1568l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM395 1896q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5 q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x1eab;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM184 1248l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM283 1576q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5q-53 0 -109.5 35.5 t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x1eac;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM356 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM420 540h490l-240 663h-6zM554 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ead;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM249 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141zM398 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1eae;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM367 1790l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM420 540h490l-240 663h-6zM606 1818l108 197h155l2 -5l-159 -192 h-106z" />
+<glyph unicode="&#x1eaf;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM253 1468l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60 t-71.5 -141zM492 1496l108 197h155l2 -5l-159 -192h-106z" />
+<glyph unicode="&#x1eb0;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM367 1790l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM411 2009l2 6h179l138 -197h-119zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x1eb1;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM253 1468l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM297 1687l2 6h179l138 -197h-119zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126 v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x1eb2;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM378 1783l2 6h144q0 -50 34 -82t106 -32q71 0 105 31.5t34 82.5h145l2 -6q6 -89 -73 -145.5t-213 -56.5q-135 0 -214 56.5t-72 145.5zM420 540h490l-240 663h-6zM596 2084l7 83q142 0 218 -39t76 -105 q0 -53 -41.5 -80.5t-104.5 -34.5l-1 -63h-135l-1 126q73 3 103 14.5t25 37.5v6q5 28 -35.5 41.5t-110.5 13.5z" />
+<glyph unicode="&#x1eb3;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM257 1457l2 6h144q0 -50 34 -82t106 -32q71 0 105 31.5t34 82.5h145l2 -6q6 -89 -73 -145.5t-213 -56.5q-135 0 -214 56.5t-72 145.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60 t-71.5 -141zM475 1758l7 83q142 0 218 -39t76 -105q0 -53 -41.5 -80.5t-104.5 -34.5l-1 -63h-135l-1 126q73 3 103 14.5t25 37.5v6q5 28 -35.5 41.5t-110.5 13.5z" />
+<glyph unicode="&#x1eb4;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM373 1787l2 6h148q0 -52 33.5 -84.5t107.5 -32.5q71 0 105.5 32.5t34.5 84.5h148l2 -6q6 -91 -74 -149t-216 -58q-137 0 -217.5 58t-73.5 149zM396 1887q0 74 47 129.5t120 55.5q45 0 112.5 -38 t110.5 -38q32 0 56 25.5t24 63.5l86 -24q0 -75 -47.5 -128.5t-118.5 -53.5q-58 0 -120 38t-103 38q-34 0 -56.5 -26t-22.5 -63zM420 540h490l-240 663h-6z" />
+<glyph unicode="&#x1eb5;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM257 1465l2 6h148q0 -52 33.5 -84.5t107.5 -32.5q71 0 105.5 32.5t34.5 84.5h148l2 -6q6 -91 -74 -149t-216 -58q-137 0 -217.5 58t-73.5 149zM280 1565q0 74 47 129.5t120 55.5q45 0 112.5 -38t110.5 -38q32 0 56 25.5 t24 63.5l86 -24q0 -75 -47.5 -128.5t-118.5 -53.5q-58 0 -120 38t-103 38q-34 0 -56.5 -26t-22.5 -63zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
+<glyph unicode="&#x1eb6;" horiz-adv-x="1326" d="M20 0l563 1456h169l554 -1456h-201l-136 375h-610l-138 -375h-201zM369 1864l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM420 540h490l-240 663h-6zM554 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1eb7;" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-95 0 -154.5 -48.5t-59.5 -116.5h-188l-2 6q-6 118 111.5 216t303.5 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM261 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141 zM398 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1eb8;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM519 -127h218v-200h-218v200z" />
+<glyph unicode="&#x1eb9;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5zM464 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1eba;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM542 1884l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ebb;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5zM472 1563l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ebc;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM281 1628q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x1ebd;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM211 1307q0 93 59 161.5t150 68.5q56 0 140 -47 t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x1ebe;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM254 1603l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM920 1773l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ebf;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM184 1282l289 257h158l288 -257l-2 -6h-198 l-167 157l-167 -157h-199zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM850 1452l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ec0;" horiz-adv-x="1197" d="M-20 2016h210l140 -260h-147zM180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM261 1586l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198z" />
+<glyph unicode="&#x1ec1;" horiz-adv-x="1083" d="M-90 1695h210l140 -260h-147zM99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM191 1265l288 257 h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x1ec2;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM253 1566l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM946 1959l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45 q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1ec3;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM183 1247l268 257h198l269 -257l-2 -6h-170 l-196 186l-196 -186h-169zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM876 1640l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1ec4;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM257 1568l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM356 1896q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5 q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5z" />
+<glyph unicode="&#x1ec5;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM187 1249l289 257h157l289 -257l-2 -6h-170 l-196 176l-196 -176h-169zM286 1577q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5zM307 654l2 -5h499v26q0 116 -62 194t-184 78 q-99 0 -169 -83.5t-86 -209.5z" />
+<glyph unicode="&#x1ec6;" horiz-adv-x="1197" d="M180 0v1456h955v-155h-758v-471h667v-155h-667v-521h769v-154h-966zM322 1601v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM519 -127h218v-200h-218v200z" />
+<glyph unicode="&#x1ec7;" horiz-adv-x="1083" d="M99 520v44q0 231 137.5 384.5t325.5 153.5q219 0 331 -132t112 -352v-123h-702l-3 -5q3 -156 79 -256.5t213 -100.5q100 0 175.5 28.5t130.5 78.5l77 -128q-58 -57 -153 -95t-230 -38q-226 0 -359.5 150.5t-133.5 390.5zM252 1280v26l246 237h120l248 -238v-25h-161 l-147 148l-146 -148h-160zM307 654l2 -5h499v26q0 116 -62 194t-184 78q-99 0 -169 -83.5t-86 -209.5zM464 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ec8;" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198zM203 1884l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ec9;" horiz-adv-x="515" d="M153 0v1082h197v-1082h-197zM166 1543l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1eca;" horiz-adv-x="579" d="M180 -128h218v-200h-218v200zM190 0v1456h198v-1456h-198z" />
+<glyph unicode="&#x1ecb;" horiz-adv-x="516" d="M149 -127h218v-200h-218v200zM159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197z" />
+<glyph unicode="&#x1ecc;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM589 -144h218v-200h-218v200z" />
+<glyph unicode="&#x1ecd;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M473 -145h218v-200h-218v200z" />
+<glyph unicode="&#x1ece;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM612 1905l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ecf;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z M496 1562l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ed0;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM324 1624l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM990 1794l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ed1;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM208 1281l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22 q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM874 1451l140 260h211l-204 -260h-147z" />
+<glyph unicode="&#x1ed2;" horiz-adv-x="1396" d="M50 2037h210l140 -260h-147zM113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328 t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM331 1607l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198z" />
+<glyph unicode="&#x1ed3;" d="M-66 1694h210l140 -260h-147zM97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM215 1264l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198zM294 529q0 -172 72.5 -284 t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x1ed4;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM323 1587l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM1016 1980l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1ed5;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM207 1246l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22 q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM900 1639l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph unicode="&#x1ed6;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM327 1589l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM426 1917q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5 t-25.5 -63.5z" />
+<glyph unicode="&#x1ed7;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM211 1248l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22 q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM310 1576q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5z" />
+<glyph unicode="&#x1ed8;" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261zM392 1622v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM589 -144h218v-200h-218v200z" />
+<glyph unicode="&#x1ed9;" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM276 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22 q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM473 -145h218v-200h-218v200z" />
+<glyph unicode="&#x1eda;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM611 1538l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1edb;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112 t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM492 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1edc;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM376 1802l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x1edd;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM257 1498l3 6h230l175 -266h-158zM294 529 q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x1ede;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM615 1905l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1edf;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112 t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM496 1562l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ee0;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM354 1610q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5 t-29 -78.5z" />
+<glyph unicode="&#x1ee1;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM235 1306q0 93 59 161.5t150 68.5q56 0 140 -47 t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
+<glyph unicode="&#x1ee2;" horiz-adv-x="1403" d="M108 598v259q0 266 159.5 443t414.5 177q120 0 223 -40t182 -113q123 11 187 96.5t64 232.5h197q0 -192 -88 -313.5t-250 -157.5q38 -71 59 -154t21 -171v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM305 598q0 -202 102.5 -330t274.5 -128 q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261zM583 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ee3;" horiz-adv-x="1175" d="M97 529v22q0 240 130 395.5t353 155.5q102 0 187 -35t149 -98q82 18 122 84t40 170h178q0 -143 -66.5 -237t-195.5 -126q35 -66 53.5 -144.5t18.5 -164.5v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112 t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22zM473 -145h218v-200h-218v200z" />
+<glyph unicode="&#x1ee4;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM587 -144h218v-200h-218v200z" />
+<glyph unicode="&#x1ee5;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM405 -137h218v-200h-218v200z" />
+<glyph unicode="&#x1ee6;" horiz-adv-x="1386" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-987q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM611 1884l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154 q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ee7;" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM494 1543l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154 q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ee8;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM606 1556l185 266h230 l2 -6l-270 -260h-147z" />
+<glyph unicode="&#x1ee9;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM490 1213l185 266h230l2 -6 l-270 -260h-147z" />
+<glyph unicode="&#x1eea;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM371 1820l3 6h230 l175 -266h-158z" />
+<glyph unicode="&#x1eeb;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM255 1477l3 6h230l175 -266 h-158z" />
+<glyph unicode="&#x1eec;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM610 1884l7 108 q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1eed;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM494 1543l7 108 q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1eee;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM349 1628q0 93 59 161.5 t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x1eef;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM233 1285q0 93 59 161.5 t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x1ef0;" horiz-adv-x="1430" d="M147 469v987h197v-987q0 -165 94 -250.5t248 -85.5q162 0 261.5 85.5t99.5 250.5v987h197v-178l6 -2q86 27 132 108.5t46 206.5h190l3 -5q2 -193 -96 -314.5t-281 -155.5v-647q0 -238 -154.5 -364t-403.5 -126q-240 0 -389.5 126.5t-149.5 363.5zM587 -144h218v-200h-218 v200z" />
+<glyph unicode="&#x1ef1;" horiz-adv-x="1204" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-114l6 -2q100 7 142.5 71t42.5 190h169l3 -6q3 -177 -85.5 -273t-277.5 -110v-838h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352zM405 -137h218v-200h-218v200 z" />
+<glyph unicode="&#x1ef2;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM300 1819l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x1ef3;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM189 1477l3 6h230l175 -266h-158z" />
+<glyph unicode="&#x1ef4;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM516 -127h218v-200h-218v200z" />
+<glyph unicode="&#x1ef5;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM608 -293h218v-200h-218v200z" />
+<glyph unicode="&#x1ef6;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM539 1883l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ef7;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM428 1543l7 108q147 0 226 -51.5t79 -137.5q0 -70 -43 -106.5t-108 -45.5l-1 -71h-140 l-1 154q76 4 108.5 20t32.5 53q0 39 -43.5 58t-116.5 19z" />
+<glyph unicode="&#x1ef8;" horiz-adv-x="1250" d="M20 1456h225l380 -740l380 740h225l-511 -944v-512h-196v525zM278 1627q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x1ef9;" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113zM167 1285q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32 q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph unicode="&#x1f4d;" horiz-adv-x="1396" d="M-220 1341v143l162 198h108l-82 -204v-137h-188zM81 1343v27l102 313h209v-21l-229 -319h-82zM113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330 t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
+<glyph unicode="&#x1fde;" horiz-adv-x="844" d="M104 1135v143l162 198h108l-82 -204v-137h-188zM405 1137v27l102 313h209v-21l-229 -319h-82z" />
+<glyph unicode="&#x2000;" horiz-adv-x="1044" />
+<glyph unicode="&#x2001;" horiz-adv-x="2089" />
+<glyph unicode="&#x2002;" horiz-adv-x="1044" />
+<glyph unicode="&#x2003;" horiz-adv-x="2089" />
+<glyph unicode="&#x2004;" horiz-adv-x="697" />
+<glyph unicode="&#x2005;" horiz-adv-x="522" />
+<glyph unicode="&#x2006;" horiz-adv-x="348" />
+<glyph unicode="&#x2007;" horiz-adv-x="1151" />
+<glyph unicode="&#x2008;" horiz-adv-x="560" />
+<glyph unicode="&#x2009;" horiz-adv-x="418" />
+<glyph unicode="&#x200a;" horiz-adv-x="209" />
+<glyph unicode="&#x200b;" horiz-adv-x="0" />
+<glyph unicode="&#x2010;" horiz-adv-x="561" d="M35 538v154h490v-154h-490z" />
+<glyph unicode="&#x2011;" horiz-adv-x="561" d="M35 538v154h490v-154h-490z" />
+<glyph unicode="&#x2012;" horiz-adv-x="561" d="M35 538v154h490v-154h-490z" />
+<glyph unicode="&#x2013;" horiz-adv-x="1416" d="M169 648v155h1086v-155h-1086z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1660" d="M141 648v155h1336v-155h-1336z" />
+<glyph unicode="&#x2015;" horiz-adv-x="1660" d="M141 648v155h1336v-155h-1336z" />
+<glyph unicode="&#x2017;" horiz-adv-x="935" d="M5 0h923v-154h-923v154zM5 -254h923v-154h-923v154z" />
+<glyph unicode="&#x2018;" horiz-adv-x="418" d="M80 1020v184l160 356h97l-60 -362v-178h-197z" />
+<glyph unicode="&#x2019;" horiz-adv-x="418" d="M80 1021l60 343v196h197v-193l-160 -346h-97z" />
+<glyph unicode="&#x201a;" horiz-adv-x="417" d="M80 -255l60 263v241h197v-223l-160 -281h-97z" />
+<glyph unicode="&#x201b;" horiz-adv-x="418" d="M43 1367l160 -346h97l-60 343v196h-197v-193z" />
+<glyph unicode="&#x201c;" horiz-adv-x="744" d="M80 1020v184l160 356h97l-60 -362v-178h-197zM409 1020v184l160 356h97l-60 -362v-178h-197z" />
+<glyph unicode="&#x201d;" horiz-adv-x="752" d="M80 1021l60 343v196h197v-193l-160 -346h-97zM417 1021l60 343v196h197v-193l-160 -346h-97z" />
+<glyph unicode="&#x201e;" horiz-adv-x="726" d="M80 -239l60 325v194h197v-184l-160 -335h-97zM388 -239l60 333v186h197v-184l-160 -335h-97z" />
+<glyph unicode="&#x2020;" horiz-adv-x="1129" d="M70 926v156h394v374h197v-374h399v-156h-399v-926h-197v926h-394z" />
+<glyph unicode="&#x2021;" horiz-adv-x="1170" d="M87 0v154h393v772h-393v156h393v374h197v-374h399v-156h-399v-772h399v-154h-399v-416h-197v416h-393z" />
+<glyph unicode="&#x2022;" horiz-adv-x="695" d="M137 733v60q0 88 56 144t150 56q95 0 151.5 -56t56.5 -144v-60q0 -89 -56 -143.5t-151 -54.5t-151 55t-56 143z" />
+<glyph unicode="&#x2025;" horiz-adv-x="970" d="M161 0v202h197v-202h-197zM604 0v202h197v-202h-197z" />
+<glyph unicode="&#x2026;" horiz-adv-x="1380" d="M161 0v202h197v-202h-197zM604 0v202h197v-202h-197zM1024 0v202h197v-202h-197z" />
+<glyph unicode="&#x202f;" horiz-adv-x="433" />
+<glyph unicode="&#x2030;" horiz-adv-x="1956" d="M64 1099v77q0 127 82 214t218 87q138 0 220 -86.5t82 -214.5v-77q0 -127 -82 -213t-218 -86q-137 0 -219.5 86t-82.5 213zM210 1099q0 -74 40.5 -125.5t115.5 -51.5q73 0 113.5 51t40.5 126v77q0 74 -41 126.5t-115 52.5t-114 -52.5t-40 -126.5v-77zM349 177l711 1138 l109 -67l-711 -1138zM819 279v78q0 126 82 213t218 87q74 0 132.5 -31.5t95.5 -85.5q37 54 95.5 85.5t132.5 31.5q137 0 219.5 -86.5t82.5 -213.5v-78q0 -128 -82 -214t-218 -86q-75 0 -134 30.5t-96 85.5q-37 -55 -95 -85.5t-131 -30.5q-138 0 -220 86t-82 214zM965 279 q0 -75 40.5 -126.5t115.5 -51.5q74 0 114 51.5t40 126.5v78q0 74 -41 126t-115 52t-114 -52t-40 -126v-78zM1421 279q0 -75 40.5 -126.5t115.5 -51.5q73 0 113 51.5t40 126.5v78q0 74 -40.5 126t-114.5 52t-114 -52t-40 -126v-78z" />
+<glyph unicode="&#x2032;" horiz-adv-x="359" d="M80 1055l1 265v240h197v-223l-101 -282h-97z" />
+<glyph unicode="&#x2033;" horiz-adv-x="668" d="M80 1040l1 240v280h197v-270l-101 -250h-97zM389 1040l1 248v272h197v-270l-101 -250h-97z" />
+<glyph unicode="&#x2039;" horiz-adv-x="615" d="M108 541v19l295 389h148l-255 -399l255 -398h-148z" />
+<glyph unicode="&#x203a;" horiz-adv-x="615" d="M88 152l255 398l-255 399h148l295 -389v-19l-295 -389h-148z" />
+<glyph unicode="&#x203c;" horiz-adv-x="1078" d="M171 0v204h198v-204h-198zM171 478v978h197v-978h-197zM710 0v204h198v-204h-198zM710 478v978h197v-978h-197z" />
+<glyph unicode="&#x2044;" horiz-adv-x="933" d="M59 177l711 1138l109 -67l-711 -1138z" />
+<glyph unicode="&#x205f;" horiz-adv-x="541" />
+<glyph unicode="&#x2074;" horiz-adv-x="941" d="M71 840l454 637h177v-604h149v-129h-149v-184h-172v184h-455zM261 873h269v377l-6 1l-13 -26z" />
+<glyph unicode="&#x207f;" horiz-adv-x="864" d="M122 651v800h136l31 -120q36 64 91 99.5t125 35.5q122 0 189.5 -75.5t67.5 -231.5v-508h-180v475q0 102 -35.5 147.5t-100.5 45.5q-53 0 -89 -27t-55 -74v-567h-180z" />
+<glyph unicode="&#x20a3;" horiz-adv-x="1193" d="M28 264v155h641v-155h-641zM180 0v1456h963v-155h-766v-502h664v-155h-664v-644h-197z" />
+<glyph unicode="&#x20a4;" horiz-adv-x="1194" d="M70 441v155h165l-6 143h-158v155h152l-5 146q0 204 112 320.5t300 116.5q200 0 310 -104.5t106 -276.5l-2 -6h-190q0 118 -63 175t-161 57q-99 0 -157 -74.5t-58 -207.5l5 -146h422v-155h-416l5 -143h411v-155h-407q-2 -83 -17 -158t-42 -129h735l-1 -154h-976v154h10 q45 12 68.5 98.5t27.5 188.5h-170z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="1682" d="M164 0v1456h354q232 0 362 -125q105 -101 125 -249h135v261h197v-261h205v-146h-205v-657q0 -76 31.5 -107t83.5 -31q17 0 37.5 4t36.5 10l26 -135q-22 -18 -64.5 -29.5t-85.5 -11.5q-120 0 -191 72.5t-71 227.5v657h-135q-20 -149 -125 -249q-130 -123 -362 -123h-157 v-564h-197zM361 719h157q147 0 220.5 83.5t73.5 205.5q0 123 -73.5 208t-220.5 85h-157v-582z" />
+<glyph unicode="&#x20ab;" horiz-adv-x="1194" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v266h-247v155h247v174h197v-174h197v-155h-197v-1231h-161l-23 133q-53 -76 -130 -115t-179 -39q-198 0 -310 143.5t-112 377.5zM165 -122h923v-154h-923v154zM295 500q0 -164 67 -262.5t208 -98.5 q88 0 148 40t98 112v505q-38 67 -98.5 106.5t-145.5 39.5q-142 0 -209.5 -117t-67.5 -304v-21z" />
+<glyph unicode="&#x20ac;" horiz-adv-x="1088" d="M79 481v155h146v136h-146v155h146v15q0 244 141.5 389.5t372.5 145.5q59 0 117.5 -8t124.5 -23l-19 -159q-54 16 -110.5 25.5t-112.5 9.5q-146 0 -231.5 -103t-85.5 -275v-17h492v-155h-492v-136h492v-155h-485l-2 -5q-4 -138 81.5 -240.5t232.5 -102.5q57 0 113 8.5 t108 25.5l19 -157q-56 -15 -117.5 -23t-122.5 -8q-231 0 -373.5 144.5t-142.5 357.5h-146z" />
+<glyph unicode="&#x2105;" horiz-adv-x="1513" d="M124 1099v77q0 127 76.5 214t204.5 87q126 0 202 -74t72 -177l-2 -6h-138q0 57 -35 96t-99 39q-65 0 -100 -52.5t-35 -126.5v-77q0 -74 35.5 -125.5t101.5 -51.5q63 0 97.5 40t34.5 94h138l2 -6q4 -105 -71 -177.5t-201 -72.5q-129 0 -206 86t-77 213zM338 177l711 1138 l109 -67l-711 -1138zM809 279v78q0 127 82 213.5t219 86.5q136 0 218.5 -86.5t82.5 -213.5v-78q0 -128 -82 -214t-217 -86q-138 0 -220.5 86t-82.5 214zM955 279q0 -75 40.5 -126.5t116.5 -51.5q73 0 113 51.5t40 126.5v78q0 74 -41 126t-114 52q-74 0 -114.5 -52 t-40.5 -126v-78z" />
+<glyph unicode="&#x2113;" horiz-adv-x="978" d="M106 419v180q55 0 105.5 6.5t96.5 19.5v473q0 177 79.5 278t218.5 101q122 0 199.5 -86t77.5 -230v-42q0 -158 -101.5 -327t-276.5 -269v-92q0 -145 48 -218t165 -73v-153l-6 -2q-199 -4 -301.5 115.5t-102.5 330.5v12q-49 -12 -99.5 -18t-102.5 -6zM505 741l6 -1 q85 64 130 166t45 211v44q0 76 -22 115t-58 39q-51 0 -76 -54.5t-25 -162.5v-357z" />
+<glyph unicode="&#x2116;" horiz-adv-x="2252" d="M171 0v1456h197l701 -1124l6 2v1122h197v-1456h-197l-701 1126l-6 -2v-1124h-197zM1435 1022v117q0 148 94 241.5t251 93.5q158 0 252 -93.5t94 -241.5v-117q0 -149 -93.5 -241.5t-250.5 -92.5q-158 0 -252.5 92.5t-94.5 241.5zM1521 304v154h490v-154h-490zM1608 1022 q0 -88 44 -140.5t130 -52.5q83 0 127.5 53t44.5 140v117q0 84 -45 137.5t-129 53.5t-128 -53.5t-44 -137.5v-117z" />
+<glyph unicode="&#x2122;" horiz-adv-x="1284" d="M103 1374v82h384v-82h-145v-455h-94v455h-145zM565 919v537h116l161 -390h6l162 390h110v-537h-93v343l-6 2l-150 -345h-51l-156 359l-6 -2v-357h-93z" />
+<glyph unicode="&#x212e;" horiz-adv-x="1304" d="M152 541q0 226 161.5 393.5t362.5 167.5q207 0 351 -155t144 -386v-47h-768v-328q55 -53 125.5 -81.5t147.5 -28.5q95 0 188 30t180 92l2 -104q-87 -55 -181 -84.5t-189 -29.5q-218 0 -371 164.5t-153 396.5zM403 609h540v286q-54 52 -123.5 82.5t-143.5 30.5 t-144.5 -32.5t-128.5 -89.5v-277z" />
+<glyph unicode="&#x215b;" horiz-adv-x="1727" d="M107 1301v134l301 23v-812h-174v655h-127zM321 177l711 1138l109 -67l-711 -1138zM955 225q0 63 44.5 113t120.5 78q-66 27 -103 72t-37 104q0 105 88.5 162.5t223.5 57.5q130 0 216 -57.5t86 -162.5q0 -59 -36.5 -104.5t-98.5 -72.5q73 -28 116 -77.5t43 -112.5 q0 -112 -92.5 -174t-232.5 -62q-146 0 -242 62t-96 174zM1126 232q0 -52 47.5 -82.5t119.5 -30.5q65 0 110 30.5t45 82.5q0 51 -46 84.5t-110 33.5q-70 0 -118 -33t-48 -85zM1152 583q0 -46 40.5 -74.5t100.5 -28.5q53 0 91 28.5t38 74.5q0 45 -37.5 71.5t-92.5 26.5 q-61 0 -100.5 -26t-39.5 -72z" />
+<glyph unicode="&#x215c;" horiz-adv-x="1878" d="M116 876l1 6h163q0 -46 37.5 -74.5t100.5 -28.5q72 0 114 29.5t42 77.5q0 62 -36.5 90.5t-109.5 28.5h-132v126h132q67 0 99.5 28.5t32.5 80.5q0 43 -36.5 72t-105.5 29q-56 0 -90.5 -24t-34.5 -64h-162l-2 6q-6 94 78.5 153.5t210.5 59.5q145 0 229 -59.5t84 -169.5 q0 -55 -35.5 -100.5t-97.5 -71.5q70 -23 108 -71t38 -116q0 -111 -90 -173t-236 -62q-127 0 -217.5 58t-84.5 169zM506 177l711 1138l109 -67l-711 -1138zM1106 225q0 63 44.5 113t120.5 78q-66 27 -103 72t-37 104q0 105 88.5 162.5t223.5 57.5q130 0 216 -57.5t86 -162.5 q0 -59 -36.5 -104.5t-98.5 -72.5q73 -28 116 -77.5t43 -112.5q0 -112 -92.5 -174t-232.5 -62q-146 0 -242 62t-96 174zM1277 232q0 -52 47.5 -82.5t119.5 -30.5q65 0 110 30.5t45 82.5q0 51 -46 84.5t-110 33.5q-70 0 -118 -33t-48 -85zM1303 583q0 -46 40.5 -74.5 t100.5 -28.5q53 0 91 28.5t38 74.5q0 45 -37.5 71.5t-92.5 26.5q-61 0 -100.5 -26t-39.5 -72z" />
+<glyph unicode="&#x215d;" horiz-adv-x="1926" d="M118 859l1 6l162 10q0 -48 41 -75t109 -27q78 0 116 34.5t38 100.5t-38.5 106.5t-105.5 40.5q-65 0 -98.5 -17t-48.5 -47l-150 9l52 455h516v-133h-363l-26 -185q30 17 69.5 29.5t81.5 13.5q132 2 207 -70.5t75 -200.5q0 -122 -79.5 -194t-245.5 -72q-137 0 -228 55 t-85 161zM562 177l711 1138l109 -67l-711 -1138zM1154 225q0 63 44.5 113t120.5 78q-66 27 -103 72t-37 104q0 105 88.5 162.5t223.5 57.5q130 0 216 -57.5t86 -162.5q0 -59 -36.5 -104.5t-98.5 -72.5q73 -28 116 -77.5t43 -112.5q0 -112 -92.5 -174t-232.5 -62 q-146 0 -242 62t-96 174zM1325 232q0 -52 47.5 -82.5t119.5 -30.5q65 0 110 30.5t45 82.5q0 51 -46 84.5t-110 33.5q-70 0 -118 -33t-48 -85zM1351 583q0 -46 40.5 -74.5t100.5 -28.5q53 0 91 28.5t38 74.5q0 45 -37.5 71.5t-92.5 26.5q-61 0 -100.5 -26t-39.5 -72z" />
+<glyph unicode="&#x215e;" horiz-adv-x="1759" d="M107 1324v131h589v-131q-134 -158 -189.5 -259.5t-55.5 -283.5v-127h-172v127q0 181 77.5 320.5t166.5 222.5h-416zM369 177l711 1138l109 -67l-711 -1138zM987 225q0 63 44.5 113t120.5 78q-66 27 -103 72t-37 104q0 105 88.5 162.5t223.5 57.5q130 0 216 -57.5 t86 -162.5q0 -59 -36.5 -104.5t-98.5 -72.5q73 -28 116 -77.5t43 -112.5q0 -112 -92.5 -174t-232.5 -62q-146 0 -242 62t-96 174zM1158 232q0 -52 47.5 -82.5t119.5 -30.5q65 0 110 30.5t45 82.5q0 51 -46 84.5t-110 33.5q-70 0 -118 -33t-48 -85zM1184 583 q0 -46 40.5 -74.5t100.5 -28.5q53 0 91 28.5t38 74.5q0 45 -37.5 71.5t-92.5 26.5q-61 0 -100.5 -26t-39.5 -72z" />
+<glyph unicode="&#x2202;" horiz-adv-x="1186" d="M72 466q0 233 125 372.5t343 139.5q95 0 179 -29.5t138 -81.5l3 5q-22 193 -139.5 311t-293.5 170l60 164q263 -63 424 -265t161 -497v-220q0 -245 -144 -400.5t-359 -155.5q-218 0 -357.5 140t-139.5 347zM269 466q0 -132 82 -232.5t222 -100.5q133 0 217.5 114 t84.5 288v129q-36 67 -122 113t-213 46q-136 0 -203.5 -100.5t-67.5 -256.5z" />
+<glyph unicode="&#x220f;" horiz-adv-x="1436" d="M168 -211v1667h1100v-1667h-197v1512h-706v-1512h-197z" />
+<glyph unicode="&#x2211;" horiz-adv-x="1202" d="M70 -123l610 713l-610 719v147h1049v-155h-808l-2 -5l560 -665v-83l-558 -657l2 -5h885v-155h-1128v146z" />
+<glyph unicode="&#x2212;" horiz-adv-x="1170" d="M168 648v155h835v-155h-835z" />
+<glyph unicode="&#x221a;" horiz-adv-x="1239" d="M63 628v156h328l163 -444l18 -83h6l19 83l399 1116h201l-549 -1456h-149l-248 628h-188z" />
+<glyph unicode="&#x221e;" horiz-adv-x="2095" d="M104 507v66q0 224 124 376.5t329 152.5q164 0 284 -108t201 -263q79 154 199 262.5t285 108.5q203 0 328 -153t125 -376v-66q0 -225 -125 -376.5t-330 -151.5q-165 0 -284 107.5t-199 263.5q-80 -155 -199.5 -263t-282.5 -108q-206 0 -330.5 151.5t-124.5 376.5zM301 507 q0 -170 65.5 -272t192.5 -102q137 0 243.5 139.5t133.5 247.5v42q-28 106 -134.5 245.5t-244.5 139.5q-126 0 -191 -103.5t-65 -270.5v-66zM1146 520q29 -110 135 -248.5t243 -138.5q126 0 192 102.5t66 271.5v66q0 167 -66 270.5t-190 103.5q-138 0 -244 -138.5 t-136 -246.5v-42z" />
+<glyph unicode="&#x222b;" horiz-adv-x="525" d="M-68 -419l14 150q14 -5 46.5 -9t50.5 -4q59 0 93.5 51.5t34.5 141.5v1308q0 173 91 267.5t253 94.5q33 0 67.5 -5.5t76.5 -15.5l-24 -145q-20 5 -42 8t-47 3q-87 0 -132.5 -54.5t-45.5 -152.5v-1308q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph unicode="&#x2248;" horiz-adv-x="1154" d="M101 447q47 68 109 107t127 39q69 1 101 -11t133 -62q89 -46 121 -58t97 -12q64 0 126 38.5t110 108.5l9 -175q-48 -69 -110 -107.5t-126 -38.5q-66 0 -99 12.5t-119 56.5q-105 52 -135.5 63.5t-98.5 10.5q-65 0 -127 -39t-109 -108zM111 874q47 68 109 107t127 39 q69 1 101 -11t133 -62q86 -44 119 -56.5t99 -12.5q64 0 126 38.5t110 107.5l9 -174q-48 -69 -110 -107.5t-126 -38.5q-66 0 -99 12.5t-119 56.5q-101 50 -133 62t-101 11q-65 0 -127 -39t-109 -107z" />
+<glyph unicode="&#x2260;" horiz-adv-x="1072" d="M152 407v164h290l140 252h-430v164h521l147 264l87 -60l-114 -204h193v-164h-284l-140 -252h424v-164h-515l-133 -240l-87 60l100 180h-199z" />
+<glyph unicode="&#x2264;" horiz-adv-x="1080" d="M158 588v135l816 340v-181l-559 -210l-85 -16v-5l85 -18l559 -205v-181zM164 7v155h835v-155h-835z" />
+<glyph unicode="&#x2265;" horiz-adv-x="1088" d="M154 247v177l598 214l85 15v6l-85 18l-598 210v176l856 -340v-135zM164 5v155h835v-155h-835z" />
+<glyph unicode="&#x25ca;" horiz-adv-x="1032" d="M41 727l398 729h150l402 -729l-399 -727h-149zM242 727l257 -511l17 -50h6l18 50l250 511l-257 512l-17 50h-6l-18 -50z" />
+<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 0v1080h1080v-1080h-1080z" />
+<glyph unicode="&#xf6c3;" horiz-adv-x="520" d="M101 -134l61 246v131h158v-140l-122 -237h-97z" />
+<glyph unicode="&#xfb02;" horiz-adv-x="1223" d="M56 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h225v-146h-225v-936h-197v936h-169zM866 0v1560h197v-1560h-197z" />
+<glyph unicode="&#xfb03;" horiz-adv-x="1847" d="M56 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h225v-146h-225v-936h-197v936h-169zM735 936v146h170v117q0 182 106.5 282t295.5 100q67 0 132 -15.5t153 -45.5l-34 -160 q-53 21 -113 36t-123 15q-117 0 -168.5 -52t-51.5 -160v-117h215v-146h-215v-936h-197v936h-170zM1490 0v1082h198v-1082h-198z" />
+<glyph unicode="&#xfb04;" horiz-adv-x="1930" d="M56 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h225v-146h-225v-936h-197v936h-169zM763 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5 l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h225v-146h-225v-936h-197v936h-169zM1573 0v1560h197v-1560h-197z" />
+<glyph unicode="&#xfeff;" horiz-adv-x="0" />
+<glyph unicode="&#xfffc;" horiz-adv-x="2100" d="M91 41v249h113v-249h-113zM91 -83h113v-202h196v-113h-309v315zM91 416v252h113v-252h-113zM91 794v250h113v-250h-113zM91 1169v285h309v-116h-196v-169h-113zM364 468v112q0 96 64 157.5t166 61.5t166.5 -61.5t64.5 -157.5v-112q0 -98 -64 -158.5t-165 -60.5 q-104 0 -168 60.5t-64 158.5zM456 468q0 -69 37 -108t103 -39q63 0 100 39t37 108v112q0 68 -37.5 107.5t-101.5 39.5t-101 -39.5t-37 -107.5v-112zM523 -285h276v-113h-276v113zM523 1338v116h276v-116h-276zM892 252v549h188q101 0 156.5 -37.5t55.5 -112.5q0 -39 -22 -70 t-62 -46q48 -13 75 -48t27 -80q0 -76 -52.5 -115.5t-144.5 -39.5h-221zM922 -285h277v-113h-277v113zM922 1338v116h277v-116h-277zM987 327h126q50 0 76.5 21.5t26.5 61.5q0 38 -25.5 61t-72.5 25h-5h-126v-169zM987 566h93q58 0 88 20t30 60q0 39 -28.5 55t-89.5 16h-93 v-151zM1321 -285h278v-113h-278v113zM1321 1338v116h278v-116h-278zM1402 412l2 6h84q0 -46 27 -68.5t77 -22.5q40 0 67.5 27t27.5 71v378h92v-378q0 -79 -53 -125t-134 -46q-91 0 -143.5 40.5t-46.5 117.5zM1720 -285h199v202h111v-315h-310v113zM1720 1338v116h310v-285 h-111v169h-199zM1919 41v249h111v-249h-111zM1919 416v252h111v-252h-111zM1919 794v250h111v-250h-111z" />
+<glyph unicode="&#xfffd;" horiz-adv-x="2101" d="M92 643l956 975l959 -975l-959 -975zM747 809l3 -6h194q1 51 30.5 77t72.5 26q54 0 83.5 -31.5t29.5 -84.5q0 -50 -25.5 -88.5t-67.5 -66.5q-79 -55 -108.5 -100t-29.5 -133h202q0 53 13 83.5t53 56.5q72 39 119 104.5t47 143.5q0 128 -84.5 203.5t-231.5 75.5 q-136 0 -219.5 -65t-80.5 -195zM929 141h202v170h-202v-170zM1054 2142v4h4v-4h-4zM1056 -551h4v-4h-4v4z" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="515" d="M-103 1317v146h721v-146h-721zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="900" d="M112 225q0 63 44.5 113t120.5 78q-66 27 -103 72t-37 104q0 105 88.5 162.5t223.5 57.5q130 0 216 -57.5t86 -162.5q0 -59 -36.5 -104.5t-98.5 -72.5q73 -28 116 -77.5t43 -112.5q0 -112 -92.5 -174t-232.5 -62q-146 0 -242 62t-96 174zM283 232q0 -52 47.5 -82.5 t119.5 -30.5q65 0 110 30.5t45 82.5q0 51 -46 84.5t-110 33.5q-70 0 -118 -33t-48 -85zM309 583q0 -46 40.5 -74.5t100.5 -28.5q53 0 91 28.5t38 74.5q0 45 -37.5 71.5t-92.5 26.5q-61 0 -100.5 -26t-39.5 -72z" />
+<glyph horiz-adv-x="876" d="M104 543q0 114 90 191.5t233 77.5q138 0 229.5 -86t91.5 -220v-235q0 -125 -97.5 -203.5t-243.5 -78.5q-51 0 -106 9t-105 25l28 127q43 -17 85 -24t98 -7q72 0 120 42t48 109v73q-31 -33 -73 -50t-89 -17q-145 0 -227 72.5t-82 194.5zM275 543q0 -66 37.5 -105.5 t110.5 -39.5q60 0 99.5 24.5t52.5 59.5v24q0 76 -44 125.5t-110 49.5t-106 -41.5t-40 -96.5z" />
+<glyph horiz-adv-x="1072" d="M120 427v311q0 195 136.5 319t334.5 124q66 0 139.5 -14t140.5 -37l-33 -148q-58 24 -115 35t-130 11q-121 0 -198.5 -81.5t-77.5 -206.5v-106q50 52 121.5 81t159.5 29q185 0 285 -99t100 -278q0 -171 -119.5 -277.5t-310.5 -106.5q-186 0 -309.5 124t-123.5 320z M317 427q0 -125 67 -208.5t169 -83.5q105 0 169 67t64 165q0 104 -57 163.5t-175 59.5q-88 0 -149 -32t-88 -86v-45z" />
+<glyph horiz-adv-x="1128" d="M71 357l575 808h204v-776h195v-154h-195v-235h-197v235h-578zM288 389h365v507l-6 2z" />
+<glyph horiz-adv-x="1046" d="M95 316l2 6h186q0 -77 60.5 -132t155.5 -55q108 0 171 54.5t63 136.5q0 98 -55.5 145.5t-165.5 47.5h-168v150h168q104 0 153.5 47.5t49.5 131.5q0 76 -55 128t-161 52q-84 0 -141 -48t-57 -119h-187l-2 6q-6 140 107 227t280 87q192 0 302.5 -86t110.5 -246 q0 -80 -48 -146.5t-132 -104.5q96 -35 147.5 -104t51.5 -168q0 -161 -120 -252t-312 -91q-168 0 -288.5 85.5t-115.5 247.5z" />
+<glyph horiz-adv-x="997" d="M95 836q-6 143 106 244t299 101q175 0 275.5 -92t100.5 -260q0 -109 -58.5 -185.5t-216.5 -236.5l-248 -249l3 -6h527v-152h-781v152l406 406q102 97 136.5 154t34.5 119q0 84 -46 140.5t-133 56.5q-101 0 -158 -57.5t-57 -140.5h-188z" />
+<glyph horiz-adv-x="606" d="M78 988v160l373 33v-1181h-197v990z" />
+<glyph horiz-adv-x="1145" d="M120 411v343q0 195 123.5 311t324.5 116q202 0 326 -116t124 -311v-343q0 -197 -123.5 -312.5t-324.5 -115.5q-202 0 -326 116t-124 312zM317 411q0 -125 68.5 -200.5t184.5 -75.5t183.5 75t67.5 201v344q0 124 -68 198.5t-185 74.5q-115 0 -183 -75t-68 -198v-344z" />
+<glyph horiz-adv-x="1088" d="M78 0v118l641 894h-607v153h848v-114l-643 -899h667v-152h-906z" />
+<glyph horiz-adv-x="1121" d="M30 1165h221l302 -576l303 576h221l-428 -755v-410h-197v419z" />
+<glyph horiz-adv-x="1161" d="M55 0l402 588l-393 577h232l274 -433l278 433h233l-392 -577l401 -588h-230l-287 442l-285 -442h-233z" />
+<glyph horiz-adv-x="1538" d="M63 1165h211l181 -901v-3l1 5l221 899h183l221 -901v-3l1 5l179 899h211l-294 -1165h-182l-225 855h-6l-227 -855h-181z" />
+<glyph horiz-adv-x="1211" d="M39 1165h211l321 -868l23 -82h6l23 80l321 870h211l-466 -1165h-185z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305z" />
+<glyph horiz-adv-x="1072" d="M71 1012v153h906v-153h-357v-1012h-197v1012h-352z" />
+<glyph horiz-adv-x="1137" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269z" />
+<glyph horiz-adv-x="1197" d="M153 0v1165h461q205 0 317.5 -90t112.5 -252q0 -89 -49.5 -152t-145.5 -102q104 -30 149.5 -102t45.5 -177v-118q0 -45 5.5 -88t18.5 -65v-19h-203q-12 23 -15 72t-3 101v116q0 90 -52 140t-150 50h-295v-479h-197zM350 633h264q120 0 176 47t56 135q0 92 -56.5 144.5 t-175.5 52.5h-264v-379z" />
+<glyph horiz-adv-x="1251" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -89 -26 -166.5t-74 -137.5l163 -159l-135 -116l-167 161q-56 -30 -122.5 -45t-139.5 -15q-223 0 -362.5 132.5t-139.5 345.5zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240 v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1246" d="M139 555v345q0 278 130 427.5t353 149.5q224 0 354 -149.5t130 -427.5v-345q0 -279 -129 -427.5t-353 -148.5t-354.5 149t-130.5 427zM336 515q0 -189 74.5 -285.5t213.5 -96.5q140 0 212.5 96t72.5 286v427q0 189 -73.5 284.5t-213.5 95.5q-139 0 -212.5 -95.5 t-73.5 -284.5v-427z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z " />
+<glyph horiz-adv-x="1308" d="M153 0v1165h197l590 -859l6 2v857h196v-1165h-196l-590 859l-6 -2v-857h-197z" />
+<glyph horiz-adv-x="928" d="M146 648v155h641v-155h-641z" />
+<glyph horiz-adv-x="1528" d="M153 0v1165h254l352 -906h6l354 906h246v-1165h-197v809l-6 2l-332 -811h-136l-338 829l-6 -2v-827h-197z" />
+<glyph horiz-adv-x="957" d="M153 0v1165h197v-1013h525v-152h-722z" />
+<glyph horiz-adv-x="1121" d="M153 0v1165h197v-508h84l388 508h231l3 -5l-455 -554l488 -601l-3 -5h-241l-396 500h-99v-500h-197z" />
+<glyph horiz-adv-x="1039" d="M70 331l2 6h188q0 -101 59 -151.5t166 -50.5q88 0 147 60.5t59 158.5v811h196v-811q0 -170 -113.5 -270.5t-288.5 -100.5q-195 0 -308 89t-107 259z" />
+<glyph horiz-adv-x="515" d="M153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="1275" d="M153 0v1165h197v-521h566v521h198v-1165h-198v491h-566v-491h-197z" />
+<glyph horiz-adv-x="1235" d="M112 461v243q0 211 145 344t370 133q222 0 343.5 -100.5t117.5 -257.5l-2 -6h-188q0 101 -72.5 156t-198.5 55q-140 0 -229 -92t-89 -231v-244q0 -142 88 -234t234 -92q105 0 173.5 21t99.5 48v250h-258v154h453v-451q-45 -65 -166 -119.5t-302 -54.5q-231 0 -375 132.5 t-144 345.5z" />
+<glyph horiz-adv-x="1055" d="M153 0v1165h817v-153h-620v-357h533v-154h-533v-501h-197z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815z" />
+<glyph horiz-adv-x="1194" d="M153 0v1165h421q211 0 355 -134.5t144 -343.5v-210q0 -210 -144 -343.5t-355 -133.5h-421zM350 152h224q126 0 214 93t88 232v211q0 137 -88 230.5t-214 93.5h-224v-860z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z " />
+<glyph horiz-adv-x="1145" d="M153 0v1165h397q213 0 331.5 -79.5t118.5 -238.5q0 -84 -47 -149t-134 -98q102 -25 160 -100t58 -171q0 -162 -110.5 -245.5t-307.5 -83.5h-466zM350 152h269q109 0 164.5 47t55.5 135q0 84 -53 134t-156 53h-11h-269v-369zM350 662h200q124 0 188.5 44.5t64.5 129.5 q0 86 -61.5 121t-191.5 35h-200v-330z" />
+<glyph horiz-adv-x="519" d="M160 1164v148l121 247h97l-21 -257v-138h-197z" />
+<glyph horiz-adv-x="932" d="M136 1450l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM180 1669l2 6h179l138 -197h-119z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM405 422h391l-193 498h-6z" />
+<glyph horiz-adv-x="1033" d="M120 1258l289 257h158l288 -257l-2 -6h-198l-167 157l-167 -157h-199zM786 1428l140 260h211l-204 -260h-147z" />
+<glyph horiz-adv-x="1034" d="M-171 1688h210l140 -260h-147zM110 1258l288 257h158l289 -257l-2 -6h-199l-167 157l-167 -157h-198z" />
+<glyph horiz-adv-x="1039" d="M110 1258l268 257h198l269 -257l-2 -6h-170l-196 186l-196 -186h-169zM803 1651l6 94q127 0 195.5 -43.5t68.5 -118.5q0 -61 -37.5 -93t-94.5 -39l-1 -61h-120l-1 133q66 4 93.5 17t27.5 45q0 34 -37.5 50t-99.5 16z" />
+<glyph horiz-adv-x="1034" d="M110 1258l289 257h157l289 -257l-2 -6h-170l-196 176l-196 -176h-169zM209 1586q0 69 48 124.5t114 55.5q42 0 103.5 -34.5t100.5 -34.5q30 0 57 28t27 63l79 -23q0 -69 -48.5 -122.5t-114.5 -53.5q-53 0 -109.5 35.5t-94.5 35.5q-31 0 -56.5 -29.5t-25.5 -63.5z" />
+<glyph horiz-adv-x="932" d="M136 1450l2 6h151q0 -51 34.5 -82.5t109.5 -31.5q73 0 108 31.5t35 82.5h152l2 -6q6 -89 -76 -146t-221 -57q-140 0 -222 57t-75 146zM375 1478l108 197h155l2 -5l-159 -192h-106z" />
+<glyph horiz-adv-x="932" d="M136 1450l2 6h144q0 -50 34 -82t106 -32q71 0 105 31.5t34 82.5h145l2 -6q6 -89 -73 -145.5t-213 -56.5q-135 0 -214 56.5t-72 145.5zM354 1751l7 83q142 0 218 -39t76 -105q0 -53 -41.5 -80.5t-104.5 -34.5l-1 -63h-135l-1 126q73 3 103 14.5t25 37.5v6q5 28 -35.5 41.5 t-110.5 13.5z" />
+<glyph horiz-adv-x="933" d="M136 1450l2 6h148q0 -52 33.5 -84.5t107.5 -32.5q71 0 105.5 32.5t34.5 84.5h148l2 -6q6 -91 -74 -149t-216 -58q-137 0 -217.5 58t-73.5 149zM159 1550q0 74 47 129.5t120 55.5q45 0 112.5 -38t110.5 -38q32 0 56 25.5t24 63.5l86 -24q0 -75 -47.5 -128.5t-118.5 -53.5 q-58 0 -120 38t-103 38q-34 0 -56.5 -26t-22.5 -63z" />
+<glyph horiz-adv-x="401" d="M96 157h197v-516h-197v516z" />
+<glyph horiz-adv-x="561" d="M19 -369l33 123q30 -11 57.5 -18.5t61.5 -7.5q61 0 88 24t27 66q0 49 -35 92.5t-94 89.5l91 67q105 -52 157 -123.5t52 -147.5q0 -99 -66.5 -154t-168.5 -55q-68 0 -116 12.5t-87 31.5z" />
+<glyph horiz-adv-x="516" d="M-66 -419l14 160q14 -5 46 -8.5t51 -3.5q60 0 94 47t34 135v243h197v-243q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5z" />
+<glyph horiz-adv-x="780" d="M-96 715v165h279q235 0 383 -128t148 -348q-2 -138 -99.5 -279t-287.5 -175l-51 148q128 34 184 112.5t56 193.5q-1 147 -92 229t-241 82h-279z" />
+<glyph horiz-adv-x="775" d="M59 1260v142l495 54v-1456h-197v1264z" />
+<glyph horiz-adv-x="1151" d="M96 1033q-5 188 125 316t360 128q196 0 312.5 -114.5t116.5 -291.5q0 -119 -70.5 -238.5t-197.5 -256.5l-383 -417l2 -5h700v-154h-943v135l477 530q128 143 173 227t45 172q0 109 -63.5 183.5t-168.5 74.5q-151 0 -222.5 -77.5t-71.5 -217.5h-189z" />
+<glyph horiz-adv-x="1195" d="M121 378l3 6h188q0 -115 70.5 -183t193.5 -68q134 0 210.5 68t76.5 201q0 135 -68 199t-214 64h-172v154h172q142 0 201 65t59 183q0 125 -67 190t-198 65q-115 0 -184.5 -67.5t-69.5 -179.5h-189l-2 6q-5 165 120 280.5t325 115.5q211 0 336.5 -107.5t125.5 -306.5 q0 -90 -57 -179.5t-171 -136.5q137 -43 193.5 -135t56.5 -206q0 -199 -136.5 -313t-347.5 -114q-199 0 -329.5 107.5t-125.5 291.5z" />
+<glyph horiz-adv-x="1183" d="M70 336v111l642 1009h208v-966h201v-154h-201v-336h-196v336h-654zM280 490h444v699l-6 1l-19 -47z" />
+<glyph horiz-adv-x="1183" d="M172 377l2 6h179q0 -119 68 -184.5t177 -65.5q125 0 194 88t69 241q0 141 -70 230.5t-193 89.5q-116 0 -168 -35t-76 -107l-164 17l84 799h729v-175h-562l-48 -409q46 34 102.5 56.5t130.5 24.5q201 2 316.5 -131t115.5 -358q0 -219 -117.5 -352t-342.5 -133 q-185 0 -308 101t-118 297z" />
+<glyph horiz-adv-x="1183" d="M147 571v278q0 280 156 454t387 174q75 0 148.5 -17t121.5 -43l-42 -151q-49 25 -102.5 40.5t-125.5 15.5q-156 0 -251.5 -125t-95.5 -326v-23q64 56 146.5 87.5t177.5 31.5q195 0 311 -135t116 -342q0 -226 -123.5 -368.5t-329.5 -142.5q-214 0 -354 155t-140 437z M343 552q0 -201 85 -310t213 -109q121 0 188.5 102.5t67.5 254.5q0 144 -72.5 237t-201.5 93q-101 0 -172 -41t-108 -109v-118z" />
+<glyph horiz-adv-x="1025" d="M30 1301v155h944v-155q-243 -315 -328 -557.5t-122 -586.5l-16 -157h-197l16 157q39 344 150.5 615t303.5 529h-751z" />
+<glyph horiz-adv-x="1237" d="M125 394q0 124 76.5 217.5t208.5 137.5q-114 41 -179 127t-65 200q0 192 124 296.5t327 104.5q201 0 327.5 -104.5t126.5 -296.5q0 -114 -66.5 -199.5t-180.5 -127.5q131 -44 209.5 -138t78.5 -217q0 -202 -137 -308.5t-356 -106.5q-223 0 -358.5 106.5t-135.5 308.5z M322 398q0 -124 81 -194.5t216 -70.5q131 0 213.5 71t82.5 194q0 119 -85 196.5t-213 77.5q-131 0 -213 -76.5t-82 -197.5zM363 1072q0 -111 70.5 -178t185.5 -67q113 0 184 67t71 178q0 108 -72.5 179t-184.5 71q-114 0 -184 -68.5t-70 -181.5z" />
+<glyph horiz-adv-x="1183" d="M98 978q0 219 131.5 359t319.5 140q228 0 359.5 -142.5t131.5 -419.5v-347q0 -285 -142.5 -437t-371.5 -152q-77 0 -156.5 14.5t-142.5 44.5l30 151q59 -31 122.5 -43.5t146.5 -12.5q144 0 230.5 109t86.5 324v66q-49 -71 -122.5 -107.5t-163.5 -36.5q-211 0 -335 130.5 t-124 359.5zM295 978q0 -150 70.5 -243t191.5 -93q109 0 181.5 47t104.5 120v126q0 191 -73.5 289t-214.5 98q-108 0 -184 -96.5t-76 -247.5z" />
+<glyph horiz-adv-x="1145" d="M153 0v1165h466q203 0 319.5 -104t116.5 -269q0 -166 -116.5 -269t-319.5 -103h-269v-420h-197zM350 574h269q117 0 177.5 63t60.5 153q0 92 -60.5 157t-177.5 65h-269v-438z" />
+<glyph horiz-adv-x="1055" d="M95 301l1 6l189 14q0 -83 61.5 -134.5t160.5 -51.5q118 0 175 62t57 172q0 107 -55.5 169.5t-156.5 62.5q-102 0 -151.5 -28.5t-73.5 -81.5l-167 13l71 661h678v-164h-507l-33 -310q37 25 94 43.5t113 20.5q181 3 283 -98t102 -286q0 -178 -105 -283t-324 -105 q-178 0 -297.5 80.5t-114.5 237.5z" />
+<glyph horiz-adv-x="892" d="M120 294v214q0 135 102.5 219.5t255.5 84.5q53 0 107 -9.5t97 -25.5l-30 -127q-39 16 -80 23.5t-92 7.5q-83 0 -135.5 -47t-52.5 -125v-66q36 34 86.5 53t113.5 19q132 0 206 -70t74 -192q0 -118 -91 -191t-235 -73q-141 0 -233.5 85t-92.5 220zM292 294q0 -78 43 -126.5 t111 -48.5q71 0 113 37.5t42 96.5q0 63 -37 98t-111 35q-64 0 -105.5 -22t-55.5 -60v-10z" />
+<glyph horiz-adv-x="892" d="M120 205l1 6l162 10q0 -48 41 -75t109 -27q78 0 116 34.5t38 100.5t-38.5 106.5t-105.5 40.5q-65 0 -98.5 -17t-48.5 -47l-150 9l52 455h516v-133h-363l-26 -185q30 17 69.5 29.5t81.5 13.5q132 2 207 -70.5t75 -200.5q0 -122 -79.5 -194t-245.5 -72q-137 0 -228 55 t-85 161z" />
+<glyph horiz-adv-x="916" d="M87 254l422 547h173v-519h126v-130h-126v-152h-170v152h-417zM269 282h243v310l-6 1l-13 -22z" />
+<glyph horiz-adv-x="876" d="M112 216l1 6h163q0 -46 37.5 -74.5t100.5 -28.5q72 0 114 29.5t42 77.5q0 62 -36.5 90.5t-109.5 28.5h-132v126h132q67 0 99.5 28.5t32.5 80.5q0 43 -36.5 72t-105.5 29q-56 0 -90.5 -24t-34.5 -64h-162l-2 6q-6 94 78.5 153.5t210.5 59.5q145 0 229 -59.5t84 -169.5 q0 -55 -35.5 -100.5t-97.5 -71.5q70 -23 108 -71t38 -116q0 -111 -90 -173t-236 -62q-127 0 -217.5 58t-84.5 169z" />
+<glyph horiz-adv-x="859" d="M119 573q-6 99 78 169t225 70q135 0 211 -64t76 -180q0 -80 -44.5 -136t-160.5 -161l-153 -135l2 -6h361v-130h-592v130l302 262q69 60 91 97.5t22 79.5q0 50 -28.5 81t-86.5 31q-67 0 -103.5 -32t-36.5 -82h-161z" />
+<glyph horiz-adv-x="696" d="M155 1249q0 72 51 119.5t124 47.5q70 0 120 -47.5t50 -119.5t-49.5 -118t-120.5 -46q-73 0 -124 46t-51 118zM243 1249q0 -35 25.5 -59.5t61.5 -24.5q34 0 58.5 24t24.5 60q0 37 -24.5 62.5t-58.5 25.5q-36 0 -61.5 -25.5t-25.5 -62.5zM283 1465l144 185h199l2 -6 l-216 -179h-129z" />
+<glyph horiz-adv-x="557" d="M95 655v134l301 23v-812h-174v655h-127z" />
+<glyph horiz-adv-x="933" d="M120 283v235q0 134 93 214t245 80t246 -80t94 -214v-235q0 -136 -93.5 -215t-244.5 -79q-153 0 -246.5 79t-93.5 215zM292 283q0 -78 44.5 -121t123.5 -43q77 0 121 43t44 121v236q0 76 -44.5 119t-122.5 43t-122 -43t-44 -119v-236z" />
+<glyph horiz-adv-x="1064" d="M71 790q0 166 120 278.5t310 112.5q185 0 306 -124.5t121 -319.5v-343q0 -181 -128 -296t-322 -115q-68 0 -142 13t-141 37l31 149q60 -26 118.5 -36.5t133.5 -10.5q108 0 180.5 74t72.5 184v117q-45 -50 -108.5 -76t-135.5 -26q-195 0 -305.5 103.5t-110.5 278.5z M269 790q0 -102 58 -169t167 -67q88 0 150 37t87 91v55q0 124 -66.5 207.5t-165.5 83.5q-102 0 -166 -73t-64 -165z" />
+<glyph horiz-adv-x="1072" d="M88 327q0 94 61.5 166.5t167.5 110.5q-91 37 -143 103t-52 153q0 153 116.5 237t296.5 84q172 0 285.5 -84t113.5 -237q0 -87 -51 -153t-137 -103q102 -39 162.5 -111t60.5 -166q0 -162 -123.5 -253t-308.5 -91q-194 0 -321.5 91t-127.5 253zM285 331q0 -87 72.5 -141.5 t179.5 -54.5q98 0 166 54.5t68 141.5q0 84 -69.5 139.5t-166.5 55.5q-105 0 -177.5 -55.5t-72.5 -139.5zM319 856q0 -77 62.5 -126.5t155.5 -49.5q83 0 141 49.5t58 126.5q0 74 -59.5 123t-141.5 49q-93 0 -154.5 -47t-61.5 -125z" />
+<glyph horiz-adv-x="957" d="M71 1012v153h800v-153q-189 -232 -270.5 -392t-81.5 -435v-185h-197v185q0 268 115.5 471t257.5 356h-624z" />
+<glyph horiz-adv-x="785" d="M95 670v131h589v-131q-134 -158 -189.5 -259.5t-55.5 -283.5v-127h-172v127q0 181 77.5 320.5t166.5 222.5h-416z" />
+<glyph horiz-adv-x="876" d="M134 1450l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph horiz-adv-x="1194" d="M-10 517v155h641v-155h-641zM153 0v1165h421q211 0 355 -134.5t144 -343.5v-210q0 -210 -144 -343.5t-355 -133.5h-421zM350 152h224q126 0 214 93t88 232v211q0 137 -88 230.5t-214 93.5h-224v-860z" />
+<glyph horiz-adv-x="1194" d="M-10 517v155h641v-155h-641zM153 0v1165h421q211 0 355 -134.5t144 -343.5v-210q0 -210 -144 -343.5t-355 -133.5h-421zM350 152h224q126 0 214 93t88 232v211q0 137 -88 230.5t-214 93.5h-224v-860z" />
+<glyph horiz-adv-x="1072" d="M71 1012v153h906v-153h-357v-1012h-197v1012h-352zM191 642v155h641v-155h-641z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM272 1497l3 6h230l175 -266h-158zM405 422h391l-193 498h-6z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM405 422h391l-193 498h-6zM507 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM291 1278v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM405 422h391l-193 498h-6z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM250 1305q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM405 422h391l-193 498h-6z " />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM253 1282v200h219v-200h-219zM405 422h391l-193 498h-6zM723 1282v200h219v-200h-219z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM388 1411q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54q-87 0 -147.5 54t-60.5 140zM405 422h391l-193 498h-6zM491 1411q0 -43 31 -73.5t74 -30.5q42 0 72 29.5 t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM405 422h391l-193 498h-6zM425 1361q0 72 51 119.5t124 47.5q70 0 120 -47.5t50 -119.5t-49.5 -118t-120.5 -46q-73 0 -124 46t-51 118zM513 1361q0 -35 25.5 -59.5t61.5 -24.5q34 0 58.5 24t24.5 60 q0 37 -24.5 62.5t-58.5 25.5q-36 0 -61.5 -25.5t-25.5 -62.5zM553 1577l144 185h199l2 -6l-216 -179h-129z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z M484 -331q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM220 1497l3 6h230l175 -266h-158z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM455 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM239 1278v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM201 1282v200h219v-200h-219zM671 1282v200h219v-200h-219z" />
+<glyph horiz-adv-x="515" d="M-73 1497l3 6h230l175 -266h-158zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="515" d="M153 0v1165h196v-1165h-196zM160 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="515" d="M-54 1278v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="515" d="M-92 1282v200h219v-200h-219zM153 0v1165h196v-1165h-196zM378 1282v200h219v-200h-219z" />
+<glyph horiz-adv-x="1308" d="M153 0v1165h197l590 -859l6 2v857h196v-1165h-196l-590 859l-6 -2v-857h-197zM281 1305q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM272 1513l3 6h230l175 -266h-158zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86 q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z M507 1249l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM291 1294v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160zM309 461q0 -154 81.5 -240t223.5 -86 t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM250 1321q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159 t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM253 1298v200h219v-200h-219zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86 q-141 0 -222 -86t-81 -237v-244zM723 1298v200h219v-200h-219z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM301 1498l3 6h230l175 -266h-158z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM536 1234l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM320 1279v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM282 1283v200h219v-200h-219zM752 1283v200h219v-200h-219z" />
+<glyph horiz-adv-x="1121" d="M30 1165h221l302 -576l303 576h221l-428 -755v-410h-197v419zM457 1232l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM242 1317v146h721v-146h-721zM405 422h391l-193 498h-6z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM303 1541l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM405 422h391l-193 498h-6z" />
+<glyph horiz-adv-x="1210" d="M39 0l469 1165h186l468 -1165h-203l-104 268h-509l-103 -268h-204zM405 422h391l-193 498h-6zM814 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5 q-95 0 -155.5 55t-60.5 154z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z M491 1249l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z M275 1294v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z M472 1297v201h218v-201h-218z" />
+<glyph horiz-adv-x="1170" d="M112 461v243q0 209 138.5 343t345.5 134q212 0 339 -101.5t122 -288.5l-2 -6h-189q0 121 -71 182t-199 61q-123 0 -205 -93t-82 -230v-244q0 -139 82 -232.5t205 -93.5q127 0 198 61t71 185h189l2 -6q5 -189 -124.5 -290.5t-335.5 -101.5q-207 0 -345.5 134t-138.5 344z M267 1538v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1194" d="M153 0v1165h421q211 0 355 -134.5t144 -343.5v-210q0 -210 -144 -343.5t-355 -133.5h-421zM184 1522v20h166l147 -148l147 148h170v-18l-257 -245h-119zM350 152h224q126 0 214 93t88 232v211q0 137 -88 230.5t-214 93.5h-224v-860z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM190 1317v146h721v-146h-721z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM251 1541l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM436 1281v201h218v-201h-218z" />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM348 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z " />
+<glyph horiz-adv-x="1095" d="M153 0v1165h815v-153h-618v-328h531v-154h-531v-378h618v-152h-815zM231 1522v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1235" d="M112 461v243q0 211 145 344t370 133q222 0 343.5 -100.5t117.5 -257.5l-2 -6h-188q0 101 -72.5 156t-198.5 55q-140 0 -229 -92t-89 -231v-244q0 -142 88 -234t234 -92q105 0 173.5 21t99.5 48v250h-258v154h453v-451q-45 -65 -166 -119.5t-302 -54.5q-231 0 -375 132.5 t-144 345.5zM287 1294v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1235" d="M112 461v243q0 211 145 344t370 133q222 0 343.5 -100.5t117.5 -257.5l-2 -6h-188q0 101 -72.5 156t-198.5 55q-140 0 -229 -92t-89 -231v-244q0 -142 88 -234t234 -92q105 0 173.5 21t99.5 48v250h-258v154h453v-451q-45 -65 -166 -119.5t-302 -54.5q-231 0 -375 132.5 t-144 345.5zM299 1557l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189z" />
+<glyph horiz-adv-x="1235" d="M112 461v243q0 211 145 344t370 133q222 0 343.5 -100.5t117.5 -257.5l-2 -6h-188q0 101 -72.5 156t-198.5 55q-140 0 -229 -92t-89 -231v-244q0 -142 88 -234t234 -92q105 0 173.5 21t99.5 48v250h-258v154h453v-451q-45 -65 -166 -119.5t-302 -54.5q-231 0 -375 132.5 t-144 345.5zM484 1297v201h218v-201h-218z" />
+<glyph horiz-adv-x="1235" d="M112 461v243q0 211 145 344t370 133q222 0 343.5 -100.5t117.5 -257.5l-2 -6h-188q0 101 -72.5 156t-198.5 55q-140 0 -229 -92t-89 -231v-244q0 -142 88 -234t234 -92q105 0 173.5 21t99.5 48v250h-258v154h453v-451q-45 -65 -166 -119.5t-302 -54.5q-231 0 -375 132.5 t-144 345.5zM446 -491l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="1275" d="M153 0v1165h197v-521h566v521h198v-1165h-198v491h-566v-491h-197zM298 1278v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="515" d="M-95 1305q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM390 1279l184 266h211l2 -5l-240 -261h-157zM659 1284l241 261h229l3 -6l-300 -260h-171z" />
+<glyph horiz-adv-x="515" d="M-42 1541l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73q-138 0 -219 73t-76 189zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="515" d="M60 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="515" d="M143 1281v201h218v-201h-218zM153 0v1165h196v-1165h-196z" />
+<glyph horiz-adv-x="1039" d="M70 331l2 6h188q0 -101 59 -151.5t166 -50.5q88 0 147 60.5t59 158.5v811h196v-811q0 -170 -113.5 -270.5t-288.5 -100.5q-195 0 -308 89t-107 259zM476 1269v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1121" d="M153 0v1165h197v-508h84l388 508h231l3 -5l-455 -554l488 -601l-3 -5h-241l-396 500h-99v-500h-197zM363 -479l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="957" d="M107 1185l185 266h230l2 -6l-270 -260h-147zM153 0v1165h197v-1013h525v-152h-722z" />
+<glyph horiz-adv-x="957" d="M153 0v1165h197v-1013h525v-152h-722zM328 -477l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="957" d="M153 0v1165h197v-1013h525v-152h-722zM432 789l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="957" d="M153 0v1165h197v-1013h525v-152h-722zM465 529v201h218v-201h-218z" />
+<glyph horiz-adv-x="1308" d="M153 0v1165h197l590 -859l6 2v857h196v-1165h-196l-590 859l-6 -2v-857h-197zM538 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1308" d="M153 0v1165h197l590 -859l6 2v857h196v-1165h-196l-590 859l-6 -2v-857h-197zM480 -477l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="1308" d="M153 0v1165h197l590 -859l6 2v857h196v-1165h-196l-590 859l-6 -2v-857h-197zM314 1522v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM242 1333v146h721v-146h-721zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86 q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM303 1557l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z" />
+<glyph horiz-adv-x="1227" d="M112 461v243q0 212 138.5 344.5t361.5 132.5q224 0 363.5 -132.5t139.5 -344.5v-243q0 -214 -138.5 -346t-362.5 -132q-223 0 -362.5 132.5t-139.5 345.5zM309 461q0 -154 81.5 -240t223.5 -86t223 86t81 240v244q0 151 -82 237t-224 86q-141 0 -222 -86t-81 -237v-244z M361 1294l184 266h211l2 -5l-240 -261h-157zM630 1299l241 261h229l3 -6l-300 -260h-171z" />
+<glyph horiz-adv-x="1197" d="M153 0v1165h461q205 0 317.5 -90t112.5 -252q0 -89 -49.5 -152t-145.5 -102q104 -30 149.5 -102t45.5 -177v-118q0 -45 5.5 -88t18.5 -65v-19h-203q-12 23 -15 72t-3 101v116q0 90 -52 140t-150 50h-295v-479h-197zM350 633h264q120 0 176 47t56 135q0 92 -56.5 144.5 t-175.5 52.5h-264v-379zM424 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1197" d="M153 0v1165h461q205 0 317.5 -90t112.5 -252q0 -89 -49.5 -152t-145.5 -102q104 -30 149.5 -102t45.5 -177v-118q0 -45 5.5 -88t18.5 -65v-19h-203q-12 23 -15 72t-3 101v116q0 90 -52 140t-150 50h-295v-479h-197zM350 633h264q120 0 176 47t56 135q0 92 -56.5 144.5 t-175.5 52.5h-264v-379zM366 -477l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="1197" d="M153 0v1165h461q205 0 317.5 -90t112.5 -252q0 -89 -49.5 -152t-145.5 -102q104 -30 149.5 -102t45.5 -177v-118q0 -45 5.5 -88t18.5 -65v-19h-203q-12 23 -15 72t-3 101v116q0 90 -52 140t-150 50h-295v-479h-197zM200 1522v20h166l147 -148l147 148h170v-18l-257 -245 h-119zM350 633h264q120 0 176 47t56 135q0 92 -56.5 144.5t-175.5 52.5h-264v-379z" />
+<glyph horiz-adv-x="1137" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269zM467 1249l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1137" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269zM251 1294v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1137" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269zM460 -331q72 0 116 24.5t44 73.5q0 48 -36 67t-123 26l32 135h140l-12 -52q65 -11 108 -52t43 -121q0 -96 -79 -153t-226 -57z" />
+<glyph horiz-adv-x="1137" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269zM243 1538v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1072" d="M71 1012v153h906v-153h-357v-1012h-197v1012h-352zM367 -477l61 246v131h158v-140l-122 -237h-97z" />
+<glyph horiz-adv-x="1072" d="M71 1012v153h906v-153h-357v-1012h-197v1012h-352zM201 1521v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM279 1306q0 93 59 161.5t150 68.5q56 0 140 -47t136 -47q41 0 71 32.5t30 79.5l108 -32q0 -94 -59.5 -159 t-149.5 -65q-71 0 -148 46.5t-128 46.5q-43 0 -72 -32.5t-29 -78.5z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM271 1318v146h721v-146h-721z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM332 1542l2 6h151q0 -66 34 -107t108 -41q72 0 107 41.5t35 106.5h151l2 -6q4 -116 -77 -189t-218 -73 q-138 0 -219 73t-76 189z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM417 1412q0 84 60.5 141t147.5 57q85 0 145 -56.5t60 -141.5q0 -86 -59.5 -140t-145.5 -54q-87 0 -147.5 54 t-60.5 140zM520 1412q0 -43 31 -73.5t74 -30.5q42 0 72 29.5t30 74.5t-30 76t-72 31q-43 0 -74 -31t-31 -76z" />
+<glyph horiz-adv-x="2274" d="M99 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5 q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269zM1236 337l1 6h188q0 -108 81.5 -158t199.5 -50q131 0 203 47t72 122q0 71 -62 115t-224 84q-223 58 -324.5 132.5t-101.5 224.5q0 147 121.5 234t327.5 87 q210 0 327.5 -93t112.5 -261l-2 -6h-187q0 92 -66 149.5t-185 57.5q-125 0 -188.5 -46.5t-63.5 -120.5q0 -73 57.5 -113.5t235.5 -83.5q215 -58 317 -136t102 -223q0 -154 -127 -238t-345 -84q-202 0 -339 85t-131 269z" />
+<glyph horiz-adv-x="1088" d="M78 0v118l641 894h-607v153h848v-114l-643 -899h667v-152h-906zM198 1522v20h166l147 -148l147 148h170v-18l-257 -245h-119z" />
+<glyph horiz-adv-x="1088" d="M78 0v118l641 894h-607v153h848v-114l-643 -899h667v-152h-906zM403 1281v201h218v-201h-218z" />
+<glyph horiz-adv-x="1088" d="M78 0v118l641 894h-607v153h848v-114l-643 -899h667v-152h-906zM422 1233l185 266h230l2 -6l-270 -260h-147z" />
+<glyph horiz-adv-x="1121" d="M30 1165h221l302 -576l303 576h221l-428 -755v-410h-197v419zM203 1281v200h219v-200h-219zM673 1281v200h219v-200h-219z" />
+<glyph horiz-adv-x="1121" d="M30 1165h221l302 -576l303 576h221l-428 -755v-410h-197v419zM241 1277v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1538" d="M63 1165h211l181 -901v-3l1 5l221 899h183l221 -901v-3l1 5l179 899h211l-294 -1165h-182l-225 855h-6l-227 -855h-181zM454 1278v26l246 237h120l248 -238v-25h-161l-147 148l-146 -148h-160z" />
+<glyph horiz-adv-x="1284" d="M137 398v767h196v-767q0 -123 84.5 -193t220.5 -70q137 0 221.5 69.5t84.5 193.5v767h196v-767q0 -195 -139.5 -305t-362.5 -110q-221 0 -361 110t-140 305zM442 -223q0 80 60.5 152t187.5 128l72 -57q-70 -52 -109.5 -99.5t-39.5 -101.5q0 -42 22.5 -66t73.5 -24 q27 0 50 7.5t49 18.5l33 -123q-36 -19 -79.5 -31.5t-103.5 -12.5q-95 0 -155.5 55t-60.5 154z" />
+<hkern u1="&#x22;" u2="w" k="-11" />
+<hkern u1="&#x27;" u2="w" k="-11" />
+<hkern u1="&#x28;" u2="&#x1ef8;" k="-22" />
+<hkern u1="&#x28;" u2="&#x1ef6;" k="-22" />
+<hkern u1="&#x28;" u2="&#x1ef4;" k="-22" />
+<hkern u1="&#x28;" u2="&#x1ef2;" k="-22" />
+<hkern u1="&#x28;" u2="&#x1e84;" k="-37" />
+<hkern u1="&#x28;" u2="&#x1e82;" k="-37" />
+<hkern u1="&#x28;" u2="&#x1e80;" k="-37" />
+<hkern u1="&#x28;" u2="&#x4b0;" k="-22" />
+<hkern u1="&#x28;" u2="&#x4ae;" k="-22" />
+<hkern u1="&#x28;" u2="&#x476;" k="-20" />
+<hkern u1="&#x28;" u2="&#x474;" k="-20" />
+<hkern u1="&#x28;" u2="&#x3ab;" k="-22" />
+<hkern u1="&#x28;" u2="&#x3a5;" k="-22" />
+<hkern u1="&#x28;" u2="&#x38e;" k="-22" />
+<hkern u1="&#x28;" u2="&#x178;" k="-22" />
+<hkern u1="&#x28;" u2="&#x176;" k="-22" />
+<hkern u1="&#x28;" u2="&#x174;" k="-37" />
+<hkern u1="&#x28;" u2="&#xdd;" k="-22" />
+<hkern u1="&#x28;" u2="Y" k="-22" />
+<hkern u1="&#x28;" u2="W" k="-37" />
+<hkern u1="&#x28;" u2="V" k="-20" />
+<hkern u1="A" g2="T.smcp" k="57" />
+<hkern u1="A" g2="U.smcp" k="15" />
+<hkern u1="A" g2="V.smcp" k="51" />
+<hkern u1="A" g2="W.smcp" k="35" />
+<hkern u1="A" g2="Y.smcp" k="60" />
+<hkern u1="A" u2="&#x50f;" k="57" />
+<hkern u1="A" u2="&#x50e;" k="88" />
+<hkern u1="A" u2="&#x506;" k="54" />
+<hkern u1="A" u2="&#x504;" k="80" />
+<hkern u1="A" u2="&#x4d8;" k="14" />
+<hkern u1="A" u2="&#x4bd;" k="35" />
+<hkern u1="A" u2="&#x4bc;" k="152" />
+<hkern u1="A" u2="&#x4b9;" k="123" />
+<hkern u1="A" u2="&#x4b8;" k="155" />
+<hkern u1="A" u2="&#x4a1;" k="126" />
+<hkern u1="A" u2="&#x442;" k="54" />
+<hkern u1="A" u2="&#x42c;" k="59" />
+<hkern u1="A" u2="&#x414;" k="-19" />
+<hkern u1="A" u2="&#x3c4;" k="56" />
+<hkern u1="A" u2="&#x3bb;" k="-17" />
+<hkern u1="A" u2="&#x3a8;" k="47" />
+<hkern u1="A" u2="&#x3a6;" k="27" />
+<hkern u1="A" u2="&#x1af;" k="18" />
+<hkern u1="A" u2="w" k="33" />
+<hkern u1="A" u2="t" k="17" />
+<hkern u1="A" u2="&#x3f;" k="80" />
+<hkern u1="B" u2="&#x50e;" k="26" />
+<hkern u1="B" u2="&#x46a;" k="-11" />
+<hkern u1="C" u2="&#x4bd;" k="19" />
+<hkern u1="C" u2="&#x7d;" k="17" />
+<hkern u1="C" u2="]" k="12" />
+<hkern u1="C" u2="&#x29;" k="26" />
+<hkern u1="D" g2="X.smcp" k="11" />
+<hkern u1="D" u2="&#x50e;" k="32" />
+<hkern u1="D" u2="&#x42c;" k="32" />
+<hkern u1="D" u2="&#x414;" k="33" />
+<hkern u1="D" u2="&#x3bb;" k="22" />
+<hkern u1="D" u2="&#x3a3;" k="16" />
+<hkern u1="D" u2="&#x39e;" k="13" />
+<hkern u1="D" u2="&#xc6;" k="33" />
+<hkern u1="E" g2="V.smcp" k="16" />
+<hkern u1="E" g2="W.smcp" k="19" />
+<hkern u1="E" g2="Y.smcp" k="16" />
+<hkern u1="E" u2="w" k="22" />
+<hkern u1="E" u2="f" k="18" />
+<hkern u1="F" u2="&#x2026;" k="273" />
+<hkern u1="F" u2="&#x2025;" k="273" />
+<hkern u1="F" u2="&#x201e;" k="273" />
+<hkern u1="F" u2="&#x201a;" k="273" />
+<hkern u1="F" u2="&#x1ef9;" k="24" />
+<hkern u1="F" u2="&#x1ef7;" k="24" />
+<hkern u1="F" u2="&#x1ef5;" k="24" />
+<hkern u1="F" u2="&#x1ef3;" k="24" />
+<hkern u1="F" u2="&#x1ef1;" k="22" />
+<hkern u1="F" u2="&#x1eef;" k="22" />
+<hkern u1="F" u2="&#x1eed;" k="22" />
+<hkern u1="F" u2="&#x1eeb;" k="22" />
+<hkern u1="F" u2="&#x1ee9;" k="22" />
+<hkern u1="F" u2="&#x1ee7;" k="22" />
+<hkern u1="F" u2="&#x1ee5;" k="22" />
+<hkern u1="F" u2="&#x1ee3;" k="21" />
+<hkern u1="F" u2="&#x1ee1;" k="21" />
+<hkern u1="F" u2="&#x1edf;" k="21" />
+<hkern u1="F" u2="&#x1edd;" k="21" />
+<hkern u1="F" u2="&#x1edb;" k="21" />
+<hkern u1="F" u2="&#x1ed9;" k="21" />
+<hkern u1="F" u2="&#x1ed7;" k="21" />
+<hkern u1="F" u2="&#x1ed5;" k="21" />
+<hkern u1="F" u2="&#x1ed3;" k="21" />
+<hkern u1="F" u2="&#x1ed1;" k="21" />
+<hkern u1="F" u2="&#x1ecf;" k="21" />
+<hkern u1="F" u2="&#x1ecd;" k="21" />
+<hkern u1="F" u2="&#x1ec7;" k="21" />
+<hkern u1="F" u2="&#x1ec5;" k="21" />
+<hkern u1="F" u2="&#x1ec3;" k="21" />
+<hkern u1="F" u2="&#x1ec1;" k="21" />
+<hkern u1="F" u2="&#x1ebf;" k="21" />
+<hkern u1="F" u2="&#x1ebd;" k="21" />
+<hkern u1="F" u2="&#x1ebb;" k="21" />
+<hkern u1="F" u2="&#x1eb9;" k="21" />
+<hkern u1="F" u2="&#x1eb7;" k="34" />
+<hkern u1="F" u2="&#x1eb6;" k="59" />
+<hkern u1="F" u2="&#x1eb5;" k="34" />
+<hkern u1="F" u2="&#x1eb4;" k="59" />
+<hkern u1="F" u2="&#x1eb3;" k="34" />
+<hkern u1="F" u2="&#x1eb2;" k="59" />
+<hkern u1="F" u2="&#x1eb1;" k="34" />
+<hkern u1="F" u2="&#x1eb0;" k="59" />
+<hkern u1="F" u2="&#x1eaf;" k="34" />
+<hkern u1="F" u2="&#x1eae;" k="59" />
+<hkern u1="F" u2="&#x1ead;" k="34" />
+<hkern u1="F" u2="&#x1eac;" k="59" />
+<hkern u1="F" u2="&#x1eab;" k="34" />
+<hkern u1="F" u2="&#x1eaa;" k="59" />
+<hkern u1="F" u2="&#x1ea9;" k="34" />
+<hkern u1="F" u2="&#x1ea8;" k="59" />
+<hkern u1="F" u2="&#x1ea7;" k="34" />
+<hkern u1="F" u2="&#x1ea6;" k="59" />
+<hkern u1="F" u2="&#x1ea5;" k="34" />
+<hkern u1="F" u2="&#x1ea4;" k="59" />
+<hkern u1="F" u2="&#x1ea3;" k="34" />
+<hkern u1="F" u2="&#x1ea2;" k="59" />
+<hkern u1="F" u2="&#x1ea1;" k="34" />
+<hkern u1="F" u2="&#x1ea0;" k="59" />
+<hkern u1="F" u2="&#x1e01;" k="34" />
+<hkern u1="F" u2="&#x1e00;" k="59" />
+<hkern u1="F" u2="&#x50d;" k="21" />
+<hkern u1="F" u2="&#x503;" k="21" />
+<hkern u1="F" u2="&#x502;" k="21" />
+<hkern u1="F" u2="&#x501;" k="21" />
+<hkern u1="F" u2="&#x4f3;" k="24" />
+<hkern u1="F" u2="&#x4f1;" k="24" />
+<hkern u1="F" u2="&#x4ef;" k="24" />
+<hkern u1="F" u2="&#x4eb;" k="21" />
+<hkern u1="F" u2="&#x4e9;" k="21" />
+<hkern u1="F" u2="&#x4e7;" k="21" />
+<hkern u1="F" u2="&#x4db;" k="21" />
+<hkern u1="F" u2="&#x4d9;" k="21" />
+<hkern u1="F" u2="&#x4d7;" k="21" />
+<hkern u1="F" u2="&#x4d3;" k="34" />
+<hkern u1="F" u2="&#x4d2;" k="59" />
+<hkern u1="F" u2="&#x4d1;" k="34" />
+<hkern u1="F" u2="&#x4d0;" k="59" />
+<hkern u1="F" u2="&#x4b4;" k="-20" />
+<hkern u1="F" u2="&#x4af;" k="24" />
+<hkern u1="F" u2="&#x4ac;" k="-20" />
+<hkern u1="F" u2="&#x4ab;" k="21" />
+<hkern u1="F" u2="&#x4a9;" k="21" />
+<hkern u1="F" u2="&#x4a0;" k="-20" />
+<hkern u1="F" u2="&#x481;" k="21" />
+<hkern u1="F" u2="&#x47d;" k="21" />
+<hkern u1="F" u2="&#x479;" k="21" />
+<hkern u1="F" u2="&#x477;" k="24" />
+<hkern u1="F" u2="&#x475;" k="24" />
+<hkern u1="F" u2="&#x473;" k="21" />
+<hkern u1="F" u2="&#x466;" k="59" />
+<hkern u1="F" u2="&#x45e;" k="24" />
+<hkern u1="F" u2="&#x454;" k="21" />
+<hkern u1="F" u2="&#x451;" k="21" />
+<hkern u1="F" u2="&#x450;" k="21" />
+<hkern u1="F" u2="&#x444;" k="21" />
+<hkern u1="F" u2="&#x443;" k="24" />
+<hkern u1="F" u2="&#x441;" k="21" />
+<hkern u1="F" u2="&#x43e;" k="21" />
+<hkern u1="F" u2="&#x435;" k="21" />
+<hkern u1="F" u2="&#x430;" k="34" />
+<hkern u1="F" u2="&#x422;" k="-20" />
+<hkern u1="F" u2="&#x410;" k="59" />
+<hkern u1="F" u2="&#x40b;" k="-20" />
+<hkern u1="F" u2="&#x402;" k="-20" />
+<hkern u1="F" u2="&#x3cd;" k="22" />
+<hkern u1="F" u2="&#x3cc;" k="21" />
+<hkern u1="F" u2="&#x3cb;" k="22" />
+<hkern u1="F" u2="&#x3c5;" k="22" />
+<hkern u1="F" u2="&#x3c3;" k="21" />
+<hkern u1="F" u2="&#x3c2;" k="21" />
+<hkern u1="F" u2="&#x3bf;" k="21" />
+<hkern u1="F" u2="&#x3bd;" k="24" />
+<hkern u1="F" u2="&#x3b3;" k="24" />
+<hkern u1="F" u2="&#x3b1;" k="21" />
+<hkern u1="F" u2="&#x3b0;" k="22" />
+<hkern u1="F" u2="&#x3ac;" k="21" />
+<hkern u1="F" u2="&#x39b;" k="59" />
+<hkern u1="F" u2="&#x394;" k="59" />
+<hkern u1="F" u2="&#x391;" k="59" />
+<hkern u1="F" u2="&#x386;" k="59" />
+<hkern u1="F" u2="&#x1fb;" k="34" />
+<hkern u1="F" u2="&#x1fa;" k="59" />
+<hkern u1="F" u2="&#x1b0;" k="22" />
+<hkern u1="F" u2="&#x1a1;" k="21" />
+<hkern u1="F" u2="&#x177;" k="24" />
+<hkern u1="F" u2="&#x173;" k="22" />
+<hkern u1="F" u2="&#x171;" k="22" />
+<hkern u1="F" u2="&#x16f;" k="22" />
+<hkern u1="F" u2="&#x16d;" k="22" />
+<hkern u1="F" u2="&#x16b;" k="22" />
+<hkern u1="F" u2="&#x169;" k="22" />
+<hkern u1="F" u2="&#x164;" k="-20" />
+<hkern u1="F" u2="&#x162;" k="-20" />
+<hkern u1="F" u2="&#x153;" k="21" />
+<hkern u1="F" u2="&#x151;" k="21" />
+<hkern u1="F" u2="&#x14f;" k="21" />
+<hkern u1="F" u2="&#x14d;" k="21" />
+<hkern u1="F" u2="&#x123;" k="21" />
+<hkern u1="F" u2="&#x121;" k="21" />
+<hkern u1="F" u2="&#x11f;" k="21" />
+<hkern u1="F" u2="&#x11d;" k="21" />
+<hkern u1="F" u2="&#x11b;" k="21" />
+<hkern u1="F" u2="&#x119;" k="21" />
+<hkern u1="F" u2="&#x117;" k="21" />
+<hkern u1="F" u2="&#x115;" k="21" />
+<hkern u1="F" u2="&#x113;" k="21" />
+<hkern u1="F" u2="&#x10f;" k="21" />
+<hkern u1="F" u2="&#x10d;" k="21" />
+<hkern u1="F" u2="&#x10b;" k="21" />
+<hkern u1="F" u2="&#x109;" k="21" />
+<hkern u1="F" u2="&#x107;" k="21" />
+<hkern u1="F" u2="&#x105;" k="34" />
+<hkern u1="F" u2="&#x104;" k="59" />
+<hkern u1="F" u2="&#x103;" k="34" />
+<hkern u1="F" u2="&#x102;" k="59" />
+<hkern u1="F" u2="&#x101;" k="34" />
+<hkern u1="F" u2="&#x100;" k="59" />
+<hkern u1="F" u2="&#xff;" k="24" />
+<hkern u1="F" u2="&#xfd;" k="24" />
+<hkern u1="F" u2="&#xfc;" k="22" />
+<hkern u1="F" u2="&#xfb;" k="22" />
+<hkern u1="F" u2="&#xfa;" k="22" />
+<hkern u1="F" u2="&#xf9;" k="22" />
+<hkern u1="F" u2="&#xf6;" k="21" />
+<hkern u1="F" u2="&#xf5;" k="21" />
+<hkern u1="F" u2="&#xf4;" k="21" />
+<hkern u1="F" u2="&#xf3;" k="21" />
+<hkern u1="F" u2="&#xf2;" k="21" />
+<hkern u1="F" u2="&#xeb;" k="21" />
+<hkern u1="F" u2="&#xea;" k="21" />
+<hkern u1="F" u2="&#xe9;" k="21" />
+<hkern u1="F" u2="&#xe8;" k="21" />
+<hkern u1="F" u2="&#xe7;" k="21" />
+<hkern u1="F" u2="&#xe5;" k="34" />
+<hkern u1="F" u2="&#xe4;" k="34" />
+<hkern u1="F" u2="&#xe3;" k="34" />
+<hkern u1="F" u2="&#xe2;" k="34" />
+<hkern u1="F" u2="&#xe1;" k="34" />
+<hkern u1="F" u2="&#xe0;" k="34" />
+<hkern u1="F" u2="&#xc5;" k="59" />
+<hkern u1="F" u2="&#xc4;" k="59" />
+<hkern u1="F" u2="&#xc3;" k="59" />
+<hkern u1="F" u2="&#xc2;" k="59" />
+<hkern u1="F" u2="&#xc1;" k="59" />
+<hkern u1="F" u2="&#xc0;" k="59" />
+<hkern u1="F" u2="y" k="24" />
+<hkern u1="F" u2="v" k="24" />
+<hkern u1="F" u2="u" k="22" />
+<hkern u1="F" u2="r" k="26" />
+<hkern u1="F" u2="q" k="21" />
+<hkern u1="F" u2="o" k="21" />
+<hkern u1="F" u2="g" k="21" />
+<hkern u1="F" u2="e" k="21" />
+<hkern u1="F" u2="d" k="21" />
+<hkern u1="F" u2="c" k="21" />
+<hkern u1="F" u2="a" k="34" />
+<hkern u1="F" u2="T" k="-20" />
+<hkern u1="F" u2="A" k="59" />
+<hkern u1="F" u2="&#x3a;" k="273" />
+<hkern u1="F" u2="&#x2e;" k="273" />
+<hkern u1="F" u2="&#x2c;" k="273" />
+<hkern u1="H" u2="&#x50e;" k="28" />
+<hkern u1="H" u2="&#x506;" k="30" />
+<hkern u1="H" u2="&#x504;" k="29" />
+<hkern u1="H" u2="&#x4bc;" k="28" />
+<hkern u1="H" u2="&#x4b9;" k="27" />
+<hkern u1="H" u2="&#x4b8;" k="28" />
+<hkern u1="H" u2="&#x434;" k="-21" />
+<hkern u1="H" u2="&#x414;" k="-21" />
+<hkern u1="I" u2="&#x50e;" k="28" />
+<hkern u1="I" u2="&#x506;" k="30" />
+<hkern u1="I" u2="&#x504;" k="29" />
+<hkern u1="I" u2="&#x4bc;" k="28" />
+<hkern u1="I" u2="&#x4b9;" k="27" />
+<hkern u1="I" u2="&#x4b8;" k="28" />
+<hkern u1="I" u2="&#x434;" k="-21" />
+<hkern u1="I" u2="&#x414;" k="-21" />
+<hkern u1="K" g2="Q.smcp" k="25" />
+<hkern u1="K" u2="&#x510;" k="17" />
+<hkern u1="K" u2="&#x50f;" k="53" />
+<hkern u1="K" u2="&#x507;" k="52" />
+<hkern u1="K" u2="&#x505;" k="52" />
+<hkern u1="K" u2="&#x4d8;" k="28" />
+<hkern u1="K" u2="&#x4b9;" k="59" />
+<hkern u1="K" u2="&#x4a1;" k="96" />
+<hkern u1="K" u2="&#x47f;" k="56" />
+<hkern u1="K" u2="&#x47b;" k="46" />
+<hkern u1="K" u2="&#x461;" k="78" />
+<hkern u1="K" u2="&#x442;" k="71" />
+<hkern u1="K" u2="&#x431;" k="41" />
+<hkern u1="K" u2="&#x3c4;" k="76" />
+<hkern u1="K" u2="&#x3a6;" k="59" />
+<hkern u1="K" u2="w" k="63" />
+<hkern u1="L" g2="Q.smcp" k="14" />
+<hkern u1="L" g2="T.smcp" k="69" />
+<hkern u1="L" g2="U.smcp" k="18" />
+<hkern u1="L" g2="V.smcp" k="73" />
+<hkern u1="L" g2="W.smcp" k="42" />
+<hkern u1="L" g2="Y.smcp" k="75" />
+<hkern u1="L" u2="w" k="52" />
+<hkern u1="M" u2="&#x50e;" k="28" />
+<hkern u1="M" u2="&#x506;" k="30" />
+<hkern u1="M" u2="&#x504;" k="29" />
+<hkern u1="M" u2="&#x4bc;" k="28" />
+<hkern u1="M" u2="&#x4b9;" k="27" />
+<hkern u1="M" u2="&#x4b8;" k="28" />
+<hkern u1="M" u2="&#x434;" k="-21" />
+<hkern u1="M" u2="&#x414;" k="-21" />
+<hkern u1="N" u2="&#x50e;" k="28" />
+<hkern u1="N" u2="&#x506;" k="30" />
+<hkern u1="N" u2="&#x504;" k="29" />
+<hkern u1="N" u2="&#x4bc;" k="28" />
+<hkern u1="N" u2="&#x4b9;" k="27" />
+<hkern u1="N" u2="&#x4b8;" k="28" />
+<hkern u1="N" u2="&#x434;" k="-21" />
+<hkern u1="N" u2="&#x414;" k="-21" />
+<hkern u1="O" g2="X.smcp" k="11" />
+<hkern u1="O" u2="&#x50e;" k="32" />
+<hkern u1="O" u2="&#x42c;" k="32" />
+<hkern u1="O" u2="&#x414;" k="33" />
+<hkern u1="O" u2="&#x3bb;" k="22" />
+<hkern u1="O" u2="&#x3a3;" k="16" />
+<hkern u1="O" u2="&#x39e;" k="13" />
+<hkern u1="O" u2="&#xc6;" k="33" />
+<hkern u1="P" u2="&#x500;" k="48" />
+<hkern u1="P" u2="&#x434;" k="171" />
+<hkern u1="P" u2="&#x414;" k="235" />
+<hkern u1="P" u2="&#x3c1;" k="56" />
+<hkern u1="P" u2="&#x3bb;" k="102" />
+<hkern u1="P" u2="&#x3b4;" k="40" />
+<hkern u1="P" u2="&#xc6;" k="293" />
+<hkern u1="P" u2="t" k="-14" />
+<hkern u1="Q" u2="&#x1ef8;" k="35" />
+<hkern u1="Q" u2="&#x1ef6;" k="35" />
+<hkern u1="Q" u2="&#x1ef4;" k="35" />
+<hkern u1="Q" u2="&#x1ef2;" k="35" />
+<hkern u1="Q" u2="&#x1e84;" k="20" />
+<hkern u1="Q" u2="&#x1e82;" k="20" />
+<hkern u1="Q" u2="&#x1e80;" k="20" />
+<hkern u1="Q" u2="&#x4b4;" k="33" />
+<hkern u1="Q" u2="&#x4b0;" k="35" />
+<hkern u1="Q" u2="&#x4ae;" k="35" />
+<hkern u1="Q" u2="&#x4ac;" k="33" />
+<hkern u1="Q" u2="&#x4a0;" k="33" />
+<hkern u1="Q" u2="&#x476;" k="28" />
+<hkern u1="Q" u2="&#x474;" k="28" />
+<hkern u1="Q" u2="&#x422;" k="33" />
+<hkern u1="Q" u2="&#x40b;" k="33" />
+<hkern u1="Q" u2="&#x402;" k="33" />
+<hkern u1="Q" u2="&#x3ab;" k="35" />
+<hkern u1="Q" u2="&#x3a5;" k="35" />
+<hkern u1="Q" u2="&#x38e;" k="35" />
+<hkern u1="Q" u2="&#x178;" k="35" />
+<hkern u1="Q" u2="&#x176;" k="35" />
+<hkern u1="Q" u2="&#x174;" k="20" />
+<hkern u1="Q" u2="&#x164;" k="33" />
+<hkern u1="Q" u2="&#x162;" k="33" />
+<hkern u1="Q" u2="&#xdd;" k="35" />
+<hkern u1="Q" u2="Y" k="35" />
+<hkern u1="Q" u2="W" k="20" />
+<hkern u1="Q" u2="V" k="28" />
+<hkern u1="Q" u2="T" k="33" />
+<hkern u1="R" u2="&#x1ef8;" k="48" />
+<hkern u1="R" u2="&#x1ef6;" k="48" />
+<hkern u1="R" u2="&#x1ef4;" k="48" />
+<hkern u1="R" u2="&#x1ef2;" k="48" />
+<hkern u1="R" u2="&#x4b4;" k="50" />
+<hkern u1="R" u2="&#x4b0;" k="48" />
+<hkern u1="R" u2="&#x4ae;" k="48" />
+<hkern u1="R" u2="&#x4ac;" k="50" />
+<hkern u1="R" u2="&#x4a0;" k="50" />
+<hkern u1="R" u2="&#x476;" k="19" />
+<hkern u1="R" u2="&#x474;" k="19" />
+<hkern u1="R" u2="&#x422;" k="50" />
+<hkern u1="R" u2="&#x40b;" k="50" />
+<hkern u1="R" u2="&#x402;" k="50" />
+<hkern u1="R" u2="&#x3ab;" k="48" />
+<hkern u1="R" u2="&#x3a5;" k="48" />
+<hkern u1="R" u2="&#x38e;" k="48" />
+<hkern u1="R" u2="&#x178;" k="48" />
+<hkern u1="R" u2="&#x176;" k="48" />
+<hkern u1="R" u2="&#x164;" k="50" />
+<hkern u1="R" u2="&#x162;" k="50" />
+<hkern u1="R" u2="&#xdd;" k="48" />
+<hkern u1="R" u2="Y" k="48" />
+<hkern u1="R" u2="V" k="19" />
+<hkern u1="R" u2="T" k="50" />
+<hkern u1="T" g2="Q.smcp" k="71" />
+<hkern u1="T" g2="S.smcp" k="68" />
+<hkern u1="T" g2="T.smcp" k="15" />
+<hkern u1="T" g2="W.smcp" k="15" />
+<hkern u1="T" g2="X.smcp" k="19" />
+<hkern u1="T" u2="&#x510;" k="14" />
+<hkern u1="T" u2="&#x50f;" k="111" />
+<hkern u1="T" u2="&#x50e;" k="-15" />
+<hkern u1="T" u2="&#x50b;" k="133" />
+<hkern u1="T" u2="&#x507;" k="83" />
+<hkern u1="T" u2="&#x505;" k="110" />
+<hkern u1="T" u2="&#x500;" k="149" />
+<hkern u1="T" u2="&#x4d8;" k="26" />
+<hkern u1="T" u2="&#x4bd;" k="148" />
+<hkern u1="T" u2="&#x4bc;" k="102" />
+<hkern u1="T" u2="&#x4bb;" k="132" />
+<hkern u1="T" u2="&#x4b9;" k="132" />
+<hkern u1="T" u2="&#x4a7;" k="96" />
+<hkern u1="T" u2="&#x4a1;" k="77" />
+<hkern u1="T" u2="&#x49d;" k="131" />
+<hkern u1="T" u2="&#x491;" k="104" />
+<hkern u1="T" u2="&#x48f;" k="127" />
+<hkern u1="T" u2="&#x47f;" k="38" />
+<hkern u1="T" u2="&#x47b;" k="153" />
+<hkern u1="T" u2="&#x461;" k="129" />
+<hkern u1="T" u2="&#x45f;" k="131" />
+<hkern u1="T" u2="&#x44f;" k="135" />
+<hkern u1="T" u2="&#x44d;" k="128" />
+<hkern u1="T" u2="&#x44b;" k="131" />
+<hkern u1="T" u2="&#x442;" k="78" />
+<hkern u1="T" u2="&#x437;" k="128" />
+<hkern u1="T" u2="&#x434;" k="140" />
+<hkern u1="T" u2="&#x432;" k="96" />
+<hkern u1="T" u2="&#x431;" k="28" />
+<hkern u1="T" u2="&#x42c;" k="-15" />
+<hkern u1="T" u2="&#x414;" k="81" />
+<hkern u1="T" u2="&#x3c9;" k="132" />
+<hkern u1="T" u2="&#x3c8;" k="131" />
+<hkern u1="T" u2="&#x3c7;" k="77" />
+<hkern u1="T" u2="&#x3c6;" k="130" />
+<hkern u1="T" u2="&#x3c4;" k="78" />
+<hkern u1="T" u2="&#x3c1;" k="135" />
+<hkern u1="T" u2="&#x3c0;" k="101" />
+<hkern u1="T" u2="&#x3b9;" k="133" />
+<hkern u1="T" u2="&#x3b5;" k="130" />
+<hkern u1="T" u2="&#x3b4;" k="15" />
+<hkern u1="T" u2="&#x3a6;" k="72" />
+<hkern u1="T" u2="&#xf8;" k="95" />
+<hkern u1="T" u2="&#xe6;" k="84" />
+<hkern u1="T" u2="&#xc6;" k="188" />
+<hkern u1="T" u2="&#xbb;" k="147" />
+<hkern u1="T" u2="&#xab;" k="151" />
+<hkern u1="T" u2="w" k="47" />
+<hkern u1="T" u2="r" k="65" />
+<hkern u1="V" g2="Q.smcp" k="39" />
+<hkern u1="V" u2="&#x7d;" k="-19" />
+<hkern u1="V" u2="r" k="30" />
+<hkern u1="V" u2="]" k="-17" />
+<hkern u1="V" u2="&#x29;" k="-20" />
+<hkern u1="W" g2="Q.smcp" k="25" />
+<hkern u1="W" u2="&#x7d;" k="-14" />
+<hkern u1="W" u2="r" k="21" />
+<hkern u1="W" u2="]" k="-12" />
+<hkern u1="W" u2="&#x29;" k="-15" />
+<hkern u1="X" g2="Q.smcp" k="23" />
+<hkern u1="X" u2="&#x510;" k="14" />
+<hkern u1="X" u2="&#x50f;" k="42" />
+<hkern u1="X" u2="&#x506;" k="-12" />
+<hkern u1="X" u2="&#x504;" k="-13" />
+<hkern u1="X" u2="&#x4d8;" k="25" />
+<hkern u1="X" u2="&#x4bd;" k="59" />
+<hkern u1="X" u2="&#x4bc;" k="42" />
+<hkern u1="X" u2="&#x4b9;" k="45" />
+<hkern u1="X" u2="&#x4a1;" k="41" />
+<hkern u1="X" u2="&#x442;" k="41" />
+<hkern u1="X" u2="&#x431;" k="23" />
+<hkern u1="X" u2="&#x414;" k="-18" />
+<hkern u1="X" u2="&#x3c9;" k="18" />
+<hkern u1="X" u2="&#x3c8;" k="27" />
+<hkern u1="X" u2="&#x3c6;" k="25" />
+<hkern u1="X" u2="&#x3c4;" k="32" />
+<hkern u1="X" u2="&#x3bb;" k="-17" />
+<hkern u1="X" u2="&#x3b8;" k="19" />
+<hkern u1="X" u2="&#x3b4;" k="16" />
+<hkern u1="X" u2="&#x3a6;" k="44" />
+<hkern u1="Y" g2="Q.smcp" k="53" />
+<hkern u1="Y" g2="T.smcp" k="13" />
+<hkern u1="Y" g2="W.smcp" k="13" />
+<hkern u1="Y" g2="X.smcp" k="17" />
+<hkern u1="Y" u2="&#x2022;" k="45" />
+<hkern u1="Y" u2="&#x3c9;" k="57" />
+<hkern u1="Y" u2="&#x3c8;" k="38" />
+<hkern u1="Y" u2="&#x3c7;" k="63" />
+<hkern u1="Y" u2="&#x3c6;" k="53" />
+<hkern u1="Y" u2="&#x3c4;" k="23" />
+<hkern u1="Y" u2="&#x3c1;" k="70" />
+<hkern u1="Y" u2="&#x3c0;" k="24" />
+<hkern u1="Y" u2="&#x3b9;" k="42" />
+<hkern u1="Y" u2="&#x3b8;" k="23" />
+<hkern u1="Y" u2="&#x3b6;" k="-13" />
+<hkern u1="Y" u2="&#x3b5;" k="58" />
+<hkern u1="Y" u2="&#x3b4;" k="18" />
+<hkern u1="Y" u2="&#x3b2;" k="22" />
+<hkern u1="Y" u2="&#x3a6;" k="48" />
+<hkern u1="Y" u2="&#xf8;" k="64" />
+<hkern u1="Y" u2="&#xe6;" k="63" />
+<hkern u1="Y" u2="&#xc6;" k="96" />
+<hkern u1="Y" u2="&#xbb;" k="51" />
+<hkern u1="Y" u2="&#xab;" k="82" />
+<hkern u1="Y" u2="&#x7d;" k="-19" />
+<hkern u1="Y" u2="t" k="22" />
+<hkern u1="Y" u2="r" k="40" />
+<hkern u1="Y" u2="f" k="22" />
+<hkern u1="Y" u2="]" k="-18" />
+<hkern u1="Y" u2="&#x2a;" k="49" />
+<hkern u1="Y" u2="&#x29;" k="-20" />
+<hkern u1="Y" u2="&#x26;" k="30" />
+<hkern u1="Z" g2="Q.smcp" k="20" />
+<hkern u1="Z" u2="&#x3c8;" k="28" />
+<hkern u1="Z" u2="&#x3a6;" k="53" />
+<hkern u1="Z" u2="w" k="27" />
+<hkern u1="[" u2="&#x1ee6;" k="18" />
+<hkern u1="[" u2="&#x1ee4;" k="18" />
+<hkern u1="[" u2="&#x408;" k="18" />
+<hkern u1="[" u2="&#x172;" k="18" />
+<hkern u1="[" u2="&#x170;" k="18" />
+<hkern u1="[" u2="&#x16e;" k="18" />
+<hkern u1="[" u2="&#x16c;" k="18" />
+<hkern u1="[" u2="&#x16a;" k="18" />
+<hkern u1="[" u2="&#x168;" k="18" />
+<hkern u1="[" u2="&#x134;" k="18" />
+<hkern u1="[" u2="&#xdc;" k="18" />
+<hkern u1="[" u2="&#xdb;" k="18" />
+<hkern u1="[" u2="&#xda;" k="18" />
+<hkern u1="[" u2="&#xd9;" k="18" />
+<hkern u1="[" u2="U" k="18" />
+<hkern u1="[" u2="J" k="18" />
+<hkern u1="a" u2="&#x50f;" k="15" />
+<hkern u1="a" u2="&#x507;" k="13" />
+<hkern u1="a" u2="&#x505;" k="13" />
+<hkern u1="a" u2="&#x4a1;" k="15" />
+<hkern u1="a" u2="&#x47f;" k="13" />
+<hkern u1="a" u2="&#x461;" k="15" />
+<hkern u1="a" u2="&#x442;" k="16" />
+<hkern u1="b" u2="&#x50f;" k="20" />
+<hkern u1="b" u2="&#x4a1;" k="20" />
+<hkern u1="b" u2="&#x442;" k="21" />
+<hkern u1="b" u2="&#x434;" k="18" />
+<hkern u1="b" u2="&#x3c7;" k="24" />
+<hkern u1="b" u2="&#x3c4;" k="22" />
+<hkern u1="e" u2="&#x442;" k="11" />
+<hkern u1="f" u2="&#x2033;" k="-16" />
+<hkern u1="f" u2="&#x2032;" k="-16" />
+<hkern u1="f" u2="&#x201d;" k="-16" />
+<hkern u1="f" u2="&#x201c;" k="-16" />
+<hkern u1="f" u2="&#x201b;" k="-16" />
+<hkern u1="f" u2="&#x2019;" k="-16" />
+<hkern u1="f" u2="&#x2018;" k="-16" />
+<hkern u1="f" u2="&#x1ee3;" k="24" />
+<hkern u1="f" u2="&#x1edf;" k="24" />
+<hkern u1="f" u2="&#x1edd;" k="24" />
+<hkern u1="f" u2="&#x1edb;" k="24" />
+<hkern u1="f" u2="&#x1ec7;" k="24" />
+<hkern u1="f" u2="&#x1ec5;" k="24" />
+<hkern u1="f" u2="&#x1ec3;" k="24" />
+<hkern u1="f" u2="&#x1ec1;" k="24" />
+<hkern u1="f" u2="&#x1ebf;" k="24" />
+<hkern u1="f" u2="&#x1ebd;" k="24" />
+<hkern u1="f" u2="&#x1ebb;" k="24" />
+<hkern u1="f" u2="&#x1eb9;" k="24" />
+<hkern u1="f" u2="&#x50d;" k="24" />
+<hkern u1="f" u2="&#x503;" k="24" />
+<hkern u1="f" u2="&#x502;" k="24" />
+<hkern u1="f" u2="&#x501;" k="24" />
+<hkern u1="f" u2="&#x4e9;" k="24" />
+<hkern u1="f" u2="&#x4db;" k="24" />
+<hkern u1="f" u2="&#x4d9;" k="24" />
+<hkern u1="f" u2="&#x4d7;" k="24" />
+<hkern u1="f" u2="&#x4ab;" k="24" />
+<hkern u1="f" u2="&#x4a9;" k="24" />
+<hkern u1="f" u2="&#x481;" k="24" />
+<hkern u1="f" u2="&#x47d;" k="24" />
+<hkern u1="f" u2="&#x479;" k="24" />
+<hkern u1="f" u2="&#x454;" k="24" />
+<hkern u1="f" u2="&#x451;" k="24" />
+<hkern u1="f" u2="&#x450;" k="24" />
+<hkern u1="f" u2="&#x444;" k="24" />
+<hkern u1="f" u2="&#x441;" k="24" />
+<hkern u1="f" u2="&#x435;" k="24" />
+<hkern u1="f" u2="&#x3c3;" k="24" />
+<hkern u1="f" u2="&#x3c2;" k="24" />
+<hkern u1="f" u2="&#x3b1;" k="24" />
+<hkern u1="f" u2="&#x3ac;" k="24" />
+<hkern u1="f" u2="&#x2bc;" k="-16" />
+<hkern u1="f" u2="&#x1a1;" k="24" />
+<hkern u1="f" u2="&#x153;" k="24" />
+<hkern u1="f" u2="&#x123;" k="24" />
+<hkern u1="f" u2="&#x121;" k="24" />
+<hkern u1="f" u2="&#x11f;" k="24" />
+<hkern u1="f" u2="&#x11d;" k="24" />
+<hkern u1="f" u2="&#x11b;" k="24" />
+<hkern u1="f" u2="&#x119;" k="24" />
+<hkern u1="f" u2="&#x117;" k="24" />
+<hkern u1="f" u2="&#x115;" k="24" />
+<hkern u1="f" u2="&#x113;" k="24" />
+<hkern u1="f" u2="&#x10f;" k="24" />
+<hkern u1="f" u2="&#x10d;" k="24" />
+<hkern u1="f" u2="&#x10b;" k="24" />
+<hkern u1="f" u2="&#x109;" k="24" />
+<hkern u1="f" u2="&#x107;" k="24" />
+<hkern u1="f" u2="&#xeb;" k="24" />
+<hkern u1="f" u2="&#xea;" k="24" />
+<hkern u1="f" u2="&#xe9;" k="24" />
+<hkern u1="f" u2="&#xe8;" k="24" />
+<hkern u1="f" u2="&#xe7;" k="24" />
+<hkern u1="f" u2="&#x7d;" k="-19" />
+<hkern u1="f" u2="q" k="24" />
+<hkern u1="f" u2="g" k="24" />
+<hkern u1="f" u2="e" k="24" />
+<hkern u1="f" u2="d" k="24" />
+<hkern u1="f" u2="c" k="24" />
+<hkern u1="f" u2="]" k="-18" />
+<hkern u1="f" u2="&#x29;" k="-20" />
+<hkern u1="f" u2="&#x27;" k="-16" />
+<hkern u1="f" u2="&#x22;" k="-16" />
+<hkern u1="k" u2="&#x1ee3;" k="20" />
+<hkern u1="k" u2="&#x1edf;" k="20" />
+<hkern u1="k" u2="&#x1edd;" k="20" />
+<hkern u1="k" u2="&#x1edb;" k="20" />
+<hkern u1="k" u2="&#x1ec7;" k="20" />
+<hkern u1="k" u2="&#x1ec5;" k="20" />
+<hkern u1="k" u2="&#x1ec3;" k="20" />
+<hkern u1="k" u2="&#x1ec1;" k="20" />
+<hkern u1="k" u2="&#x1ebf;" k="20" />
+<hkern u1="k" u2="&#x1ebd;" k="20" />
+<hkern u1="k" u2="&#x1ebb;" k="20" />
+<hkern u1="k" u2="&#x1eb9;" k="20" />
+<hkern u1="k" u2="&#x50d;" k="20" />
+<hkern u1="k" u2="&#x503;" k="20" />
+<hkern u1="k" u2="&#x502;" k="20" />
+<hkern u1="k" u2="&#x501;" k="20" />
+<hkern u1="k" u2="&#x4e9;" k="20" />
+<hkern u1="k" u2="&#x4db;" k="20" />
+<hkern u1="k" u2="&#x4d9;" k="20" />
+<hkern u1="k" u2="&#x4d7;" k="20" />
+<hkern u1="k" u2="&#x4ab;" k="20" />
+<hkern u1="k" u2="&#x4a9;" k="20" />
+<hkern u1="k" u2="&#x481;" k="20" />
+<hkern u1="k" u2="&#x47d;" k="20" />
+<hkern u1="k" u2="&#x479;" k="20" />
+<hkern u1="k" u2="&#x454;" k="20" />
+<hkern u1="k" u2="&#x451;" k="20" />
+<hkern u1="k" u2="&#x450;" k="20" />
+<hkern u1="k" u2="&#x444;" k="20" />
+<hkern u1="k" u2="&#x441;" k="20" />
+<hkern u1="k" u2="&#x435;" k="20" />
+<hkern u1="k" u2="&#x3c3;" k="20" />
+<hkern u1="k" u2="&#x3c2;" k="20" />
+<hkern u1="k" u2="&#x3b1;" k="20" />
+<hkern u1="k" u2="&#x3ac;" k="20" />
+<hkern u1="k" u2="&#x1a1;" k="20" />
+<hkern u1="k" u2="&#x153;" k="20" />
+<hkern u1="k" u2="&#x123;" k="20" />
+<hkern u1="k" u2="&#x121;" k="20" />
+<hkern u1="k" u2="&#x11f;" k="20" />
+<hkern u1="k" u2="&#x11d;" k="20" />
+<hkern u1="k" u2="&#x11b;" k="20" />
+<hkern u1="k" u2="&#x119;" k="20" />
+<hkern u1="k" u2="&#x117;" k="20" />
+<hkern u1="k" u2="&#x115;" k="20" />
+<hkern u1="k" u2="&#x113;" k="20" />
+<hkern u1="k" u2="&#x10f;" k="20" />
+<hkern u1="k" u2="&#x10d;" k="20" />
+<hkern u1="k" u2="&#x10b;" k="20" />
+<hkern u1="k" u2="&#x109;" k="20" />
+<hkern u1="k" u2="&#x107;" k="20" />
+<hkern u1="k" u2="&#xeb;" k="20" />
+<hkern u1="k" u2="&#xea;" k="20" />
+<hkern u1="k" u2="&#xe9;" k="20" />
+<hkern u1="k" u2="&#xe8;" k="20" />
+<hkern u1="k" u2="&#xe7;" k="20" />
+<hkern u1="k" u2="q" k="20" />
+<hkern u1="k" u2="g" k="20" />
+<hkern u1="k" u2="e" k="20" />
+<hkern u1="k" u2="d" k="20" />
+<hkern u1="k" u2="c" k="20" />
+<hkern u1="o" u2="&#x50f;" k="20" />
+<hkern u1="o" u2="&#x505;" k="11" />
+<hkern u1="o" u2="&#x4a1;" k="21" />
+<hkern u1="o" u2="&#x47f;" k="15" />
+<hkern u1="o" u2="&#x461;" k="16" />
+<hkern u1="o" u2="&#x442;" k="22" />
+<hkern u1="o" u2="&#x3c7;" k="22" />
+<hkern u1="o" u2="&#x3c4;" k="22" />
+<hkern u1="p" u2="&#x50f;" k="20" />
+<hkern u1="p" u2="&#x4a1;" k="20" />
+<hkern u1="p" u2="&#x442;" k="21" />
+<hkern u1="p" u2="&#x434;" k="18" />
+<hkern u1="p" u2="&#x3c7;" k="24" />
+<hkern u1="p" u2="&#x3c4;" k="22" />
+<hkern u1="r" u2="w" k="-17" />
+<hkern u1="r" u2="t" k="-17" />
+<hkern u1="r" u2="f" k="-15" />
+<hkern u1="v" u2="&#x47b;" k="15" />
+<hkern u1="v" u2="&#x434;" k="56" />
+<hkern u1="v" u2="&#x3c4;" k="-12" />
+<hkern u1="v" u2="&#x3c1;" k="22" />
+<hkern u1="v" u2="&#x3c0;" k="-11" />
+<hkern u1="v" u2="&#x3b4;" k="11" />
+<hkern u1="v" u2="f" k="-13" />
+<hkern u1="w" u2="&#x2026;" k="124" />
+<hkern u1="w" u2="&#x2025;" k="124" />
+<hkern u1="w" u2="&#x201e;" k="124" />
+<hkern u1="w" u2="&#x201a;" k="124" />
+<hkern u1="w" u2="&#x3a;" k="124" />
+<hkern u1="w" u2="&#x2e;" k="124" />
+<hkern u1="w" u2="&#x2c;" k="124" />
+<hkern u1="x" u2="&#x47b;" k="15" />
+<hkern u1="y" u2="&#x47b;" k="15" />
+<hkern u1="y" u2="&#x434;" k="56" />
+<hkern u1="y" u2="&#x3c4;" k="-12" />
+<hkern u1="y" u2="&#x3c1;" k="22" />
+<hkern u1="y" u2="&#x3c0;" k="-11" />
+<hkern u1="y" u2="&#x3b4;" k="11" />
+<hkern u1="y" u2="f" k="-13" />
+<hkern u1="&#x7b;" u2="&#x1ee6;" k="20" />
+<hkern u1="&#x7b;" u2="&#x1ee4;" k="20" />
+<hkern u1="&#x7b;" u2="&#x408;" k="20" />
+<hkern u1="&#x7b;" u2="&#x172;" k="20" />
+<hkern u1="&#x7b;" u2="&#x170;" k="20" />
+<hkern u1="&#x7b;" u2="&#x16e;" k="20" />
+<hkern u1="&#x7b;" u2="&#x16c;" k="20" />
+<hkern u1="&#x7b;" u2="&#x16a;" k="20" />
+<hkern u1="&#x7b;" u2="&#x168;" k="20" />
+<hkern u1="&#x7b;" u2="&#x134;" k="20" />
+<hkern u1="&#x7b;" u2="&#xdc;" k="20" />
+<hkern u1="&#x7b;" u2="&#xdb;" k="20" />
+<hkern u1="&#x7b;" u2="&#xda;" k="20" />
+<hkern u1="&#x7b;" u2="&#xd9;" k="20" />
+<hkern u1="&#x7b;" u2="U" k="20" />
+<hkern u1="&#x7b;" u2="J" k="20" />
+<hkern u1="&#xc0;" g2="T.smcp" k="57" />
+<hkern u1="&#xc0;" g2="U.smcp" k="15" />
+<hkern u1="&#xc0;" g2="V.smcp" k="51" />
+<hkern u1="&#xc0;" g2="W.smcp" k="35" />
+<hkern u1="&#xc0;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc0;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc0;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc0;" u2="&#x506;" k="54" />
+<hkern u1="&#xc0;" u2="&#x504;" k="80" />
+<hkern u1="&#xc0;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc0;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc0;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc0;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc0;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc0;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc0;" u2="&#x442;" k="54" />
+<hkern u1="&#xc0;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc0;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc0;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc0;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc0;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc0;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc0;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc0;" u2="w" k="33" />
+<hkern u1="&#xc0;" u2="t" k="17" />
+<hkern u1="&#xc0;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc1;" g2="T.smcp" k="57" />
+<hkern u1="&#xc1;" g2="U.smcp" k="15" />
+<hkern u1="&#xc1;" g2="V.smcp" k="51" />
+<hkern u1="&#xc1;" g2="W.smcp" k="35" />
+<hkern u1="&#xc1;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc1;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc1;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc1;" u2="&#x506;" k="54" />
+<hkern u1="&#xc1;" u2="&#x504;" k="80" />
+<hkern u1="&#xc1;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc1;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc1;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc1;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc1;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc1;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc1;" u2="&#x442;" k="54" />
+<hkern u1="&#xc1;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc1;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc1;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc1;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc1;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc1;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc1;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc1;" u2="w" k="33" />
+<hkern u1="&#xc1;" u2="t" k="17" />
+<hkern u1="&#xc1;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc2;" g2="T.smcp" k="57" />
+<hkern u1="&#xc2;" g2="U.smcp" k="15" />
+<hkern u1="&#xc2;" g2="V.smcp" k="51" />
+<hkern u1="&#xc2;" g2="W.smcp" k="35" />
+<hkern u1="&#xc2;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc2;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc2;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc2;" u2="&#x506;" k="54" />
+<hkern u1="&#xc2;" u2="&#x504;" k="80" />
+<hkern u1="&#xc2;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc2;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc2;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc2;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc2;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc2;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc2;" u2="&#x442;" k="54" />
+<hkern u1="&#xc2;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc2;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc2;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc2;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc2;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc2;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc2;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc2;" u2="w" k="33" />
+<hkern u1="&#xc2;" u2="t" k="17" />
+<hkern u1="&#xc2;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc3;" g2="T.smcp" k="57" />
+<hkern u1="&#xc3;" g2="U.smcp" k="15" />
+<hkern u1="&#xc3;" g2="V.smcp" k="51" />
+<hkern u1="&#xc3;" g2="W.smcp" k="35" />
+<hkern u1="&#xc3;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc3;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc3;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc3;" u2="&#x506;" k="54" />
+<hkern u1="&#xc3;" u2="&#x504;" k="80" />
+<hkern u1="&#xc3;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc3;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc3;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc3;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc3;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc3;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc3;" u2="&#x442;" k="54" />
+<hkern u1="&#xc3;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc3;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc3;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc3;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc3;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc3;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc3;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc3;" u2="w" k="33" />
+<hkern u1="&#xc3;" u2="t" k="17" />
+<hkern u1="&#xc3;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc4;" g2="T.smcp" k="57" />
+<hkern u1="&#xc4;" g2="U.smcp" k="15" />
+<hkern u1="&#xc4;" g2="V.smcp" k="51" />
+<hkern u1="&#xc4;" g2="W.smcp" k="35" />
+<hkern u1="&#xc4;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc4;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc4;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc4;" u2="&#x506;" k="54" />
+<hkern u1="&#xc4;" u2="&#x504;" k="80" />
+<hkern u1="&#xc4;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc4;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc4;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc4;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc4;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc4;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc4;" u2="&#x442;" k="54" />
+<hkern u1="&#xc4;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc4;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc4;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc4;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc4;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc4;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc4;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc4;" u2="w" k="33" />
+<hkern u1="&#xc4;" u2="t" k="17" />
+<hkern u1="&#xc4;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc5;" g2="T.smcp" k="57" />
+<hkern u1="&#xc5;" g2="U.smcp" k="15" />
+<hkern u1="&#xc5;" g2="V.smcp" k="51" />
+<hkern u1="&#xc5;" g2="W.smcp" k="35" />
+<hkern u1="&#xc5;" g2="Y.smcp" k="60" />
+<hkern u1="&#xc5;" u2="&#x50f;" k="57" />
+<hkern u1="&#xc5;" u2="&#x50e;" k="88" />
+<hkern u1="&#xc5;" u2="&#x506;" k="54" />
+<hkern u1="&#xc5;" u2="&#x504;" k="80" />
+<hkern u1="&#xc5;" u2="&#x4d8;" k="14" />
+<hkern u1="&#xc5;" u2="&#x4bd;" k="35" />
+<hkern u1="&#xc5;" u2="&#x4bc;" k="152" />
+<hkern u1="&#xc5;" u2="&#x4b9;" k="123" />
+<hkern u1="&#xc5;" u2="&#x4b8;" k="155" />
+<hkern u1="&#xc5;" u2="&#x4a1;" k="126" />
+<hkern u1="&#xc5;" u2="&#x442;" k="54" />
+<hkern u1="&#xc5;" u2="&#x42c;" k="59" />
+<hkern u1="&#xc5;" u2="&#x414;" k="-19" />
+<hkern u1="&#xc5;" u2="&#x3c4;" k="56" />
+<hkern u1="&#xc5;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#xc5;" u2="&#x3a8;" k="47" />
+<hkern u1="&#xc5;" u2="&#x3a6;" k="27" />
+<hkern u1="&#xc5;" u2="&#x1af;" k="18" />
+<hkern u1="&#xc5;" u2="w" k="33" />
+<hkern u1="&#xc5;" u2="t" k="17" />
+<hkern u1="&#xc5;" u2="&#x3f;" k="80" />
+<hkern u1="&#xc7;" u2="&#x4bd;" k="19" />
+<hkern u1="&#xc7;" u2="&#x7d;" k="17" />
+<hkern u1="&#xc7;" u2="]" k="12" />
+<hkern u1="&#xc7;" u2="&#x29;" k="26" />
+<hkern u1="&#xc8;" g2="V.smcp" k="16" />
+<hkern u1="&#xc8;" g2="W.smcp" k="19" />
+<hkern u1="&#xc8;" g2="Y.smcp" k="16" />
+<hkern u1="&#xc8;" u2="w" k="22" />
+<hkern u1="&#xc8;" u2="f" k="18" />
+<hkern u1="&#xc9;" g2="V.smcp" k="16" />
+<hkern u1="&#xc9;" g2="W.smcp" k="19" />
+<hkern u1="&#xc9;" g2="Y.smcp" k="16" />
+<hkern u1="&#xc9;" u2="w" k="22" />
+<hkern u1="&#xc9;" u2="f" k="18" />
+<hkern u1="&#xca;" g2="V.smcp" k="16" />
+<hkern u1="&#xca;" g2="W.smcp" k="19" />
+<hkern u1="&#xca;" g2="Y.smcp" k="16" />
+<hkern u1="&#xca;" u2="w" k="22" />
+<hkern u1="&#xca;" u2="f" k="18" />
+<hkern u1="&#xcb;" g2="V.smcp" k="16" />
+<hkern u1="&#xcb;" g2="W.smcp" k="19" />
+<hkern u1="&#xcb;" g2="Y.smcp" k="16" />
+<hkern u1="&#xcb;" u2="w" k="22" />
+<hkern u1="&#xcb;" u2="f" k="18" />
+<hkern u1="&#xcc;" u2="&#x50e;" k="28" />
+<hkern u1="&#xcc;" u2="&#x506;" k="30" />
+<hkern u1="&#xcc;" u2="&#x504;" k="29" />
+<hkern u1="&#xcc;" u2="&#x4bc;" k="28" />
+<hkern u1="&#xcc;" u2="&#x4b9;" k="27" />
+<hkern u1="&#xcc;" u2="&#x4b8;" k="28" />
+<hkern u1="&#xcc;" u2="&#x434;" k="-21" />
+<hkern u1="&#xcc;" u2="&#x414;" k="-21" />
+<hkern u1="&#xcd;" u2="&#x50e;" k="28" />
+<hkern u1="&#xcd;" u2="&#x506;" k="30" />
+<hkern u1="&#xcd;" u2="&#x504;" k="29" />
+<hkern u1="&#xcd;" u2="&#x4bc;" k="28" />
+<hkern u1="&#xcd;" u2="&#x4b9;" k="27" />
+<hkern u1="&#xcd;" u2="&#x4b8;" k="28" />
+<hkern u1="&#xcd;" u2="&#x434;" k="-21" />
+<hkern u1="&#xcd;" u2="&#x414;" k="-21" />
+<hkern u1="&#xce;" u2="&#x50e;" k="28" />
+<hkern u1="&#xce;" u2="&#x506;" k="30" />
+<hkern u1="&#xce;" u2="&#x504;" k="29" />
+<hkern u1="&#xce;" u2="&#x4bc;" k="28" />
+<hkern u1="&#xce;" u2="&#x4b9;" k="27" />
+<hkern u1="&#xce;" u2="&#x4b8;" k="28" />
+<hkern u1="&#xce;" u2="&#x434;" k="-21" />
+<hkern u1="&#xce;" u2="&#x414;" k="-21" />
+<hkern u1="&#xcf;" u2="&#x50e;" k="28" />
+<hkern u1="&#xcf;" u2="&#x506;" k="30" />
+<hkern u1="&#xcf;" u2="&#x504;" k="29" />
+<hkern u1="&#xcf;" u2="&#x4bc;" k="28" />
+<hkern u1="&#xcf;" u2="&#x4b9;" k="27" />
+<hkern u1="&#xcf;" u2="&#x4b8;" k="28" />
+<hkern u1="&#xcf;" u2="&#x434;" k="-21" />
+<hkern u1="&#xcf;" u2="&#x414;" k="-21" />
+<hkern u1="&#xd0;" g2="X.smcp" k="11" />
+<hkern u1="&#xd0;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd0;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd0;" u2="&#x414;" k="33" />
+<hkern u1="&#xd0;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd0;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd0;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd0;" u2="&#xc6;" k="33" />
+<hkern u1="&#xd1;" u2="&#x50e;" k="28" />
+<hkern u1="&#xd1;" u2="&#x506;" k="30" />
+<hkern u1="&#xd1;" u2="&#x504;" k="29" />
+<hkern u1="&#xd1;" u2="&#x4bc;" k="28" />
+<hkern u1="&#xd1;" u2="&#x4b9;" k="27" />
+<hkern u1="&#xd1;" u2="&#x4b8;" k="28" />
+<hkern u1="&#xd1;" u2="&#x434;" k="-21" />
+<hkern u1="&#xd1;" u2="&#x414;" k="-21" />
+<hkern u1="&#xd2;" g2="X.smcp" k="11" />
+<hkern u1="&#xd2;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd2;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd2;" u2="&#x414;" k="33" />
+<hkern u1="&#xd2;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd2;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd2;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd2;" u2="&#xc6;" k="33" />
+<hkern u1="&#xd3;" g2="X.smcp" k="11" />
+<hkern u1="&#xd3;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd3;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd3;" u2="&#x414;" k="33" />
+<hkern u1="&#xd3;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd3;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd3;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd3;" u2="&#xc6;" k="33" />
+<hkern u1="&#xd4;" g2="X.smcp" k="11" />
+<hkern u1="&#xd4;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd4;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd4;" u2="&#x414;" k="33" />
+<hkern u1="&#xd4;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd4;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd4;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd4;" u2="&#xc6;" k="33" />
+<hkern u1="&#xd5;" g2="X.smcp" k="11" />
+<hkern u1="&#xd5;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd5;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd5;" u2="&#x414;" k="33" />
+<hkern u1="&#xd5;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd5;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd5;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd5;" u2="&#xc6;" k="33" />
+<hkern u1="&#xd6;" g2="X.smcp" k="11" />
+<hkern u1="&#xd6;" u2="&#x50e;" k="32" />
+<hkern u1="&#xd6;" u2="&#x42c;" k="32" />
+<hkern u1="&#xd6;" u2="&#x414;" k="33" />
+<hkern u1="&#xd6;" u2="&#x3bb;" k="22" />
+<hkern u1="&#xd6;" u2="&#x3a3;" k="16" />
+<hkern u1="&#xd6;" u2="&#x39e;" k="13" />
+<hkern u1="&#xd6;" u2="&#xc6;" k="33" />
+<hkern u1="&#xdd;" g2="Q.smcp" k="53" />
+<hkern u1="&#xdd;" g2="T.smcp" k="13" />
+<hkern u1="&#xdd;" g2="W.smcp" k="13" />
+<hkern u1="&#xdd;" g2="X.smcp" k="17" />
+<hkern u1="&#xdd;" u2="&#x2022;" k="45" />
+<hkern u1="&#xdd;" u2="&#x3c9;" k="57" />
+<hkern u1="&#xdd;" u2="&#x3c8;" k="38" />
+<hkern u1="&#xdd;" u2="&#x3c7;" k="63" />
+<hkern u1="&#xdd;" u2="&#x3c6;" k="53" />
+<hkern u1="&#xdd;" u2="&#x3c4;" k="23" />
+<hkern u1="&#xdd;" u2="&#x3c1;" k="70" />
+<hkern u1="&#xdd;" u2="&#x3c0;" k="24" />
+<hkern u1="&#xdd;" u2="&#x3b9;" k="42" />
+<hkern u1="&#xdd;" u2="&#x3b8;" k="23" />
+<hkern u1="&#xdd;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#xdd;" u2="&#x3b5;" k="58" />
+<hkern u1="&#xdd;" u2="&#x3b4;" k="18" />
+<hkern u1="&#xdd;" u2="&#x3b2;" k="22" />
+<hkern u1="&#xdd;" u2="&#x3a6;" k="48" />
+<hkern u1="&#xdd;" u2="&#xf8;" k="64" />
+<hkern u1="&#xdd;" u2="&#xe6;" k="63" />
+<hkern u1="&#xdd;" u2="&#xc6;" k="96" />
+<hkern u1="&#xdd;" u2="&#xbb;" k="51" />
+<hkern u1="&#xdd;" u2="&#xab;" k="82" />
+<hkern u1="&#xdd;" u2="&#x7d;" k="-19" />
+<hkern u1="&#xdd;" u2="t" k="22" />
+<hkern u1="&#xdd;" u2="r" k="40" />
+<hkern u1="&#xdd;" u2="f" k="22" />
+<hkern u1="&#xdd;" u2="]" k="-18" />
+<hkern u1="&#xdd;" u2="&#x2a;" k="49" />
+<hkern u1="&#xdd;" u2="&#x29;" k="-20" />
+<hkern u1="&#xdd;" u2="&#x26;" k="30" />
+<hkern u1="&#xe0;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe0;" u2="&#x507;" k="13" />
+<hkern u1="&#xe0;" u2="&#x505;" k="13" />
+<hkern u1="&#xe0;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe0;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe0;" u2="&#x461;" k="15" />
+<hkern u1="&#xe0;" u2="&#x442;" k="16" />
+<hkern u1="&#xe1;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe1;" u2="&#x507;" k="13" />
+<hkern u1="&#xe1;" u2="&#x505;" k="13" />
+<hkern u1="&#xe1;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe1;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe1;" u2="&#x461;" k="15" />
+<hkern u1="&#xe1;" u2="&#x442;" k="16" />
+<hkern u1="&#xe2;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe2;" u2="&#x507;" k="13" />
+<hkern u1="&#xe2;" u2="&#x505;" k="13" />
+<hkern u1="&#xe2;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe2;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe2;" u2="&#x461;" k="15" />
+<hkern u1="&#xe2;" u2="&#x442;" k="16" />
+<hkern u1="&#xe3;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe3;" u2="&#x507;" k="13" />
+<hkern u1="&#xe3;" u2="&#x505;" k="13" />
+<hkern u1="&#xe3;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe3;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe3;" u2="&#x461;" k="15" />
+<hkern u1="&#xe3;" u2="&#x442;" k="16" />
+<hkern u1="&#xe4;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe4;" u2="&#x507;" k="13" />
+<hkern u1="&#xe4;" u2="&#x505;" k="13" />
+<hkern u1="&#xe4;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe4;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe4;" u2="&#x461;" k="15" />
+<hkern u1="&#xe4;" u2="&#x442;" k="16" />
+<hkern u1="&#xe5;" u2="&#x50f;" k="15" />
+<hkern u1="&#xe5;" u2="&#x507;" k="13" />
+<hkern u1="&#xe5;" u2="&#x505;" k="13" />
+<hkern u1="&#xe5;" u2="&#x4a1;" k="15" />
+<hkern u1="&#xe5;" u2="&#x47f;" k="13" />
+<hkern u1="&#xe5;" u2="&#x461;" k="15" />
+<hkern u1="&#xe5;" u2="&#x442;" k="16" />
+<hkern u1="&#xe8;" u2="&#x442;" k="11" />
+<hkern u1="&#xe9;" u2="&#x442;" k="11" />
+<hkern u1="&#xea;" u2="&#x442;" k="11" />
+<hkern u1="&#xeb;" u2="&#x442;" k="11" />
+<hkern u1="&#xf2;" u2="&#x50f;" k="20" />
+<hkern u1="&#xf2;" u2="&#x505;" k="11" />
+<hkern u1="&#xf2;" u2="&#x4a1;" k="21" />
+<hkern u1="&#xf2;" u2="&#x47f;" k="15" />
+<hkern u1="&#xf2;" u2="&#x461;" k="16" />
+<hkern u1="&#xf2;" u2="&#x442;" k="22" />
+<hkern u1="&#xf2;" u2="&#x3c7;" k="22" />
+<hkern u1="&#xf2;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xf3;" u2="&#x50f;" k="20" />
+<hkern u1="&#xf3;" u2="&#x505;" k="11" />
+<hkern u1="&#xf3;" u2="&#x4a1;" k="21" />
+<hkern u1="&#xf3;" u2="&#x47f;" k="15" />
+<hkern u1="&#xf3;" u2="&#x461;" k="16" />
+<hkern u1="&#xf3;" u2="&#x442;" k="22" />
+<hkern u1="&#xf3;" u2="&#x3c7;" k="22" />
+<hkern u1="&#xf3;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xf4;" u2="&#x50f;" k="20" />
+<hkern u1="&#xf4;" u2="&#x505;" k="11" />
+<hkern u1="&#xf4;" u2="&#x4a1;" k="21" />
+<hkern u1="&#xf4;" u2="&#x47f;" k="15" />
+<hkern u1="&#xf4;" u2="&#x461;" k="16" />
+<hkern u1="&#xf4;" u2="&#x442;" k="22" />
+<hkern u1="&#xf4;" u2="&#x3c7;" k="22" />
+<hkern u1="&#xf4;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xf5;" u2="&#x50f;" k="20" />
+<hkern u1="&#xf5;" u2="&#x505;" k="11" />
+<hkern u1="&#xf5;" u2="&#x4a1;" k="21" />
+<hkern u1="&#xf5;" u2="&#x47f;" k="15" />
+<hkern u1="&#xf5;" u2="&#x461;" k="16" />
+<hkern u1="&#xf5;" u2="&#x442;" k="22" />
+<hkern u1="&#xf5;" u2="&#x3c7;" k="22" />
+<hkern u1="&#xf5;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xf6;" u2="&#x50f;" k="20" />
+<hkern u1="&#xf6;" u2="&#x505;" k="11" />
+<hkern u1="&#xf6;" u2="&#x4a1;" k="21" />
+<hkern u1="&#xf6;" u2="&#x47f;" k="15" />
+<hkern u1="&#xf6;" u2="&#x461;" k="16" />
+<hkern u1="&#xf6;" u2="&#x442;" k="22" />
+<hkern u1="&#xf6;" u2="&#x3c7;" k="22" />
+<hkern u1="&#xf6;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xfd;" u2="&#x47b;" k="15" />
+<hkern u1="&#xfd;" u2="&#x434;" k="56" />
+<hkern u1="&#xfd;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#xfd;" u2="&#x3c1;" k="22" />
+<hkern u1="&#xfd;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#xfd;" u2="&#x3b4;" k="11" />
+<hkern u1="&#xfd;" u2="f" k="-13" />
+<hkern u1="&#xfe;" u2="&#x50f;" k="20" />
+<hkern u1="&#xfe;" u2="&#x4a1;" k="20" />
+<hkern u1="&#xfe;" u2="&#x442;" k="21" />
+<hkern u1="&#xfe;" u2="&#x434;" k="18" />
+<hkern u1="&#xfe;" u2="&#x3c7;" k="24" />
+<hkern u1="&#xfe;" u2="&#x3c4;" k="22" />
+<hkern u1="&#xff;" u2="&#x47b;" k="15" />
+<hkern u1="&#xff;" u2="&#x434;" k="56" />
+<hkern u1="&#xff;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#xff;" u2="&#x3c1;" k="22" />
+<hkern u1="&#xff;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#xff;" u2="&#x3b4;" k="11" />
+<hkern u1="&#xff;" u2="f" k="-13" />
+<hkern u1="&#x100;" g2="T.smcp" k="57" />
+<hkern u1="&#x100;" g2="U.smcp" k="15" />
+<hkern u1="&#x100;" g2="V.smcp" k="51" />
+<hkern u1="&#x100;" g2="W.smcp" k="35" />
+<hkern u1="&#x100;" g2="Y.smcp" k="60" />
+<hkern u1="&#x100;" u2="&#x50f;" k="57" />
+<hkern u1="&#x100;" u2="&#x50e;" k="88" />
+<hkern u1="&#x100;" u2="&#x506;" k="54" />
+<hkern u1="&#x100;" u2="&#x504;" k="80" />
+<hkern u1="&#x100;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x100;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x100;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x100;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x100;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x100;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x100;" u2="&#x442;" k="54" />
+<hkern u1="&#x100;" u2="&#x42c;" k="59" />
+<hkern u1="&#x100;" u2="&#x414;" k="-19" />
+<hkern u1="&#x100;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x100;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x100;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x100;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x100;" u2="&#x1af;" k="18" />
+<hkern u1="&#x100;" u2="w" k="33" />
+<hkern u1="&#x100;" u2="t" k="17" />
+<hkern u1="&#x100;" u2="&#x3f;" k="80" />
+<hkern u1="&#x101;" u2="&#x50f;" k="15" />
+<hkern u1="&#x101;" u2="&#x507;" k="13" />
+<hkern u1="&#x101;" u2="&#x505;" k="13" />
+<hkern u1="&#x101;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x101;" u2="&#x47f;" k="13" />
+<hkern u1="&#x101;" u2="&#x461;" k="15" />
+<hkern u1="&#x101;" u2="&#x442;" k="16" />
+<hkern u1="&#x102;" g2="T.smcp" k="57" />
+<hkern u1="&#x102;" g2="U.smcp" k="15" />
+<hkern u1="&#x102;" g2="V.smcp" k="51" />
+<hkern u1="&#x102;" g2="W.smcp" k="35" />
+<hkern u1="&#x102;" g2="Y.smcp" k="60" />
+<hkern u1="&#x102;" u2="&#x50f;" k="57" />
+<hkern u1="&#x102;" u2="&#x50e;" k="88" />
+<hkern u1="&#x102;" u2="&#x506;" k="54" />
+<hkern u1="&#x102;" u2="&#x504;" k="80" />
+<hkern u1="&#x102;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x102;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x102;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x102;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x102;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x102;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x102;" u2="&#x442;" k="54" />
+<hkern u1="&#x102;" u2="&#x42c;" k="59" />
+<hkern u1="&#x102;" u2="&#x414;" k="-19" />
+<hkern u1="&#x102;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x102;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x102;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x102;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x102;" u2="&#x1af;" k="18" />
+<hkern u1="&#x102;" u2="w" k="33" />
+<hkern u1="&#x102;" u2="t" k="17" />
+<hkern u1="&#x102;" u2="&#x3f;" k="80" />
+<hkern u1="&#x103;" u2="&#x50f;" k="15" />
+<hkern u1="&#x103;" u2="&#x507;" k="13" />
+<hkern u1="&#x103;" u2="&#x505;" k="13" />
+<hkern u1="&#x103;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x103;" u2="&#x47f;" k="13" />
+<hkern u1="&#x103;" u2="&#x461;" k="15" />
+<hkern u1="&#x103;" u2="&#x442;" k="16" />
+<hkern u1="&#x104;" g2="T.smcp" k="57" />
+<hkern u1="&#x104;" g2="U.smcp" k="15" />
+<hkern u1="&#x104;" g2="V.smcp" k="51" />
+<hkern u1="&#x104;" g2="W.smcp" k="35" />
+<hkern u1="&#x104;" g2="Y.smcp" k="60" />
+<hkern u1="&#x104;" u2="&#x50f;" k="57" />
+<hkern u1="&#x104;" u2="&#x50e;" k="88" />
+<hkern u1="&#x104;" u2="&#x506;" k="54" />
+<hkern u1="&#x104;" u2="&#x504;" k="80" />
+<hkern u1="&#x104;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x104;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x104;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x104;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x104;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x104;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x104;" u2="&#x442;" k="54" />
+<hkern u1="&#x104;" u2="&#x42c;" k="59" />
+<hkern u1="&#x104;" u2="&#x414;" k="-19" />
+<hkern u1="&#x104;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x104;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x104;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x104;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x104;" u2="&#x1af;" k="18" />
+<hkern u1="&#x104;" u2="w" k="33" />
+<hkern u1="&#x104;" u2="t" k="17" />
+<hkern u1="&#x104;" u2="&#x3f;" k="80" />
+<hkern u1="&#x105;" u2="&#x50f;" k="15" />
+<hkern u1="&#x105;" u2="&#x507;" k="13" />
+<hkern u1="&#x105;" u2="&#x505;" k="13" />
+<hkern u1="&#x105;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x105;" u2="&#x47f;" k="13" />
+<hkern u1="&#x105;" u2="&#x461;" k="15" />
+<hkern u1="&#x105;" u2="&#x442;" k="16" />
+<hkern u1="&#x106;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x106;" u2="&#x7d;" k="17" />
+<hkern u1="&#x106;" u2="]" k="12" />
+<hkern u1="&#x106;" u2="&#x29;" k="26" />
+<hkern u1="&#x108;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x108;" u2="&#x7d;" k="17" />
+<hkern u1="&#x108;" u2="]" k="12" />
+<hkern u1="&#x108;" u2="&#x29;" k="26" />
+<hkern u1="&#x10a;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x10a;" u2="&#x7d;" k="17" />
+<hkern u1="&#x10a;" u2="]" k="12" />
+<hkern u1="&#x10a;" u2="&#x29;" k="26" />
+<hkern u1="&#x10c;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x10c;" u2="&#x7d;" k="17" />
+<hkern u1="&#x10c;" u2="]" k="12" />
+<hkern u1="&#x10c;" u2="&#x29;" k="26" />
+<hkern u1="&#x10e;" g2="X.smcp" k="11" />
+<hkern u1="&#x10e;" u2="&#x50e;" k="32" />
+<hkern u1="&#x10e;" u2="&#x42c;" k="32" />
+<hkern u1="&#x10e;" u2="&#x414;" k="33" />
+<hkern u1="&#x10e;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x10e;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x10e;" u2="&#x39e;" k="13" />
+<hkern u1="&#x10e;" u2="&#xc6;" k="33" />
+<hkern u1="&#x110;" g2="X.smcp" k="11" />
+<hkern u1="&#x110;" u2="&#x50e;" k="32" />
+<hkern u1="&#x110;" u2="&#x42c;" k="32" />
+<hkern u1="&#x110;" u2="&#x414;" k="33" />
+<hkern u1="&#x110;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x110;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x110;" u2="&#x39e;" k="13" />
+<hkern u1="&#x110;" u2="&#xc6;" k="33" />
+<hkern u1="&#x112;" g2="V.smcp" k="16" />
+<hkern u1="&#x112;" g2="W.smcp" k="19" />
+<hkern u1="&#x112;" g2="Y.smcp" k="16" />
+<hkern u1="&#x112;" u2="w" k="22" />
+<hkern u1="&#x112;" u2="f" k="18" />
+<hkern u1="&#x113;" u2="&#x442;" k="11" />
+<hkern u1="&#x114;" g2="V.smcp" k="16" />
+<hkern u1="&#x114;" g2="W.smcp" k="19" />
+<hkern u1="&#x114;" g2="Y.smcp" k="16" />
+<hkern u1="&#x114;" u2="w" k="22" />
+<hkern u1="&#x114;" u2="f" k="18" />
+<hkern u1="&#x115;" u2="&#x442;" k="11" />
+<hkern u1="&#x116;" g2="V.smcp" k="16" />
+<hkern u1="&#x116;" g2="W.smcp" k="19" />
+<hkern u1="&#x116;" g2="Y.smcp" k="16" />
+<hkern u1="&#x116;" u2="w" k="22" />
+<hkern u1="&#x116;" u2="f" k="18" />
+<hkern u1="&#x117;" u2="&#x442;" k="11" />
+<hkern u1="&#x118;" g2="V.smcp" k="16" />
+<hkern u1="&#x118;" g2="W.smcp" k="19" />
+<hkern u1="&#x118;" g2="Y.smcp" k="16" />
+<hkern u1="&#x118;" u2="w" k="22" />
+<hkern u1="&#x118;" u2="f" k="18" />
+<hkern u1="&#x119;" u2="&#x442;" k="11" />
+<hkern u1="&#x11a;" g2="V.smcp" k="16" />
+<hkern u1="&#x11a;" g2="W.smcp" k="19" />
+<hkern u1="&#x11a;" g2="Y.smcp" k="16" />
+<hkern u1="&#x11a;" u2="w" k="22" />
+<hkern u1="&#x11a;" u2="f" k="18" />
+<hkern u1="&#x11b;" u2="&#x442;" k="11" />
+<hkern u1="&#x124;" u2="&#x50e;" k="28" />
+<hkern u1="&#x124;" u2="&#x506;" k="30" />
+<hkern u1="&#x124;" u2="&#x504;" k="29" />
+<hkern u1="&#x124;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x124;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x124;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x124;" u2="&#x434;" k="-21" />
+<hkern u1="&#x124;" u2="&#x414;" k="-21" />
+<hkern u1="&#x128;" u2="&#x50e;" k="28" />
+<hkern u1="&#x128;" u2="&#x506;" k="30" />
+<hkern u1="&#x128;" u2="&#x504;" k="29" />
+<hkern u1="&#x128;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x128;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x128;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x128;" u2="&#x434;" k="-21" />
+<hkern u1="&#x128;" u2="&#x414;" k="-21" />
+<hkern u1="&#x12a;" u2="&#x50e;" k="28" />
+<hkern u1="&#x12a;" u2="&#x506;" k="30" />
+<hkern u1="&#x12a;" u2="&#x504;" k="29" />
+<hkern u1="&#x12a;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x12a;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x12a;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x12a;" u2="&#x434;" k="-21" />
+<hkern u1="&#x12a;" u2="&#x414;" k="-21" />
+<hkern u1="&#x12c;" u2="&#x50e;" k="28" />
+<hkern u1="&#x12c;" u2="&#x506;" k="30" />
+<hkern u1="&#x12c;" u2="&#x504;" k="29" />
+<hkern u1="&#x12c;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x12c;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x12c;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x12c;" u2="&#x434;" k="-21" />
+<hkern u1="&#x12c;" u2="&#x414;" k="-21" />
+<hkern u1="&#x12e;" u2="&#x50e;" k="28" />
+<hkern u1="&#x12e;" u2="&#x506;" k="30" />
+<hkern u1="&#x12e;" u2="&#x504;" k="29" />
+<hkern u1="&#x12e;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x12e;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x12e;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x12e;" u2="&#x434;" k="-21" />
+<hkern u1="&#x12e;" u2="&#x414;" k="-21" />
+<hkern u1="&#x130;" u2="&#x50e;" k="28" />
+<hkern u1="&#x130;" u2="&#x506;" k="30" />
+<hkern u1="&#x130;" u2="&#x504;" k="29" />
+<hkern u1="&#x130;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x130;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x130;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x130;" u2="&#x434;" k="-21" />
+<hkern u1="&#x130;" u2="&#x414;" k="-21" />
+<hkern u1="&#x136;" g2="Q.smcp" k="25" />
+<hkern u1="&#x136;" u2="&#x510;" k="17" />
+<hkern u1="&#x136;" u2="&#x50f;" k="53" />
+<hkern u1="&#x136;" u2="&#x507;" k="52" />
+<hkern u1="&#x136;" u2="&#x505;" k="52" />
+<hkern u1="&#x136;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x136;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x136;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x136;" u2="&#x47f;" k="56" />
+<hkern u1="&#x136;" u2="&#x47b;" k="46" />
+<hkern u1="&#x136;" u2="&#x461;" k="78" />
+<hkern u1="&#x136;" u2="&#x442;" k="71" />
+<hkern u1="&#x136;" u2="&#x431;" k="41" />
+<hkern u1="&#x136;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x136;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x136;" u2="w" k="63" />
+<hkern u1="&#x139;" g2="Q.smcp" k="14" />
+<hkern u1="&#x139;" g2="T.smcp" k="69" />
+<hkern u1="&#x139;" g2="U.smcp" k="18" />
+<hkern u1="&#x139;" g2="V.smcp" k="73" />
+<hkern u1="&#x139;" g2="W.smcp" k="42" />
+<hkern u1="&#x139;" g2="Y.smcp" k="75" />
+<hkern u1="&#x139;" u2="w" k="52" />
+<hkern u1="&#x13b;" g2="Q.smcp" k="14" />
+<hkern u1="&#x13b;" g2="T.smcp" k="69" />
+<hkern u1="&#x13b;" g2="U.smcp" k="18" />
+<hkern u1="&#x13b;" g2="V.smcp" k="73" />
+<hkern u1="&#x13b;" g2="W.smcp" k="42" />
+<hkern u1="&#x13b;" g2="Y.smcp" k="75" />
+<hkern u1="&#x13b;" u2="w" k="52" />
+<hkern u1="&#x13d;" g2="Q.smcp" k="14" />
+<hkern u1="&#x13d;" g2="T.smcp" k="69" />
+<hkern u1="&#x13d;" g2="U.smcp" k="18" />
+<hkern u1="&#x13d;" g2="V.smcp" k="73" />
+<hkern u1="&#x13d;" g2="W.smcp" k="42" />
+<hkern u1="&#x13d;" g2="Y.smcp" k="75" />
+<hkern u1="&#x13d;" u2="w" k="52" />
+<hkern u1="&#x13f;" g2="Q.smcp" k="14" />
+<hkern u1="&#x13f;" g2="T.smcp" k="69" />
+<hkern u1="&#x13f;" g2="U.smcp" k="18" />
+<hkern u1="&#x13f;" g2="V.smcp" k="73" />
+<hkern u1="&#x13f;" g2="W.smcp" k="42" />
+<hkern u1="&#x13f;" g2="Y.smcp" k="75" />
+<hkern u1="&#x13f;" u2="w" k="52" />
+<hkern u1="&#x143;" u2="&#x50e;" k="28" />
+<hkern u1="&#x143;" u2="&#x506;" k="30" />
+<hkern u1="&#x143;" u2="&#x504;" k="29" />
+<hkern u1="&#x143;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x143;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x143;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x143;" u2="&#x434;" k="-21" />
+<hkern u1="&#x143;" u2="&#x414;" k="-21" />
+<hkern u1="&#x145;" u2="&#x50e;" k="28" />
+<hkern u1="&#x145;" u2="&#x506;" k="30" />
+<hkern u1="&#x145;" u2="&#x504;" k="29" />
+<hkern u1="&#x145;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x145;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x145;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x145;" u2="&#x434;" k="-21" />
+<hkern u1="&#x145;" u2="&#x414;" k="-21" />
+<hkern u1="&#x147;" u2="&#x50e;" k="28" />
+<hkern u1="&#x147;" u2="&#x506;" k="30" />
+<hkern u1="&#x147;" u2="&#x504;" k="29" />
+<hkern u1="&#x147;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x147;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x147;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x147;" u2="&#x434;" k="-21" />
+<hkern u1="&#x147;" u2="&#x414;" k="-21" />
+<hkern u1="&#x14c;" g2="X.smcp" k="11" />
+<hkern u1="&#x14c;" u2="&#x50e;" k="32" />
+<hkern u1="&#x14c;" u2="&#x42c;" k="32" />
+<hkern u1="&#x14c;" u2="&#x414;" k="33" />
+<hkern u1="&#x14c;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x14c;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x14c;" u2="&#x39e;" k="13" />
+<hkern u1="&#x14c;" u2="&#xc6;" k="33" />
+<hkern u1="&#x14d;" u2="&#x50f;" k="20" />
+<hkern u1="&#x14d;" u2="&#x505;" k="11" />
+<hkern u1="&#x14d;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x14d;" u2="&#x47f;" k="15" />
+<hkern u1="&#x14d;" u2="&#x461;" k="16" />
+<hkern u1="&#x14d;" u2="&#x442;" k="22" />
+<hkern u1="&#x14d;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x14d;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x14e;" g2="X.smcp" k="11" />
+<hkern u1="&#x14e;" u2="&#x50e;" k="32" />
+<hkern u1="&#x14e;" u2="&#x42c;" k="32" />
+<hkern u1="&#x14e;" u2="&#x414;" k="33" />
+<hkern u1="&#x14e;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x14e;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x14e;" u2="&#x39e;" k="13" />
+<hkern u1="&#x14e;" u2="&#xc6;" k="33" />
+<hkern u1="&#x14f;" u2="&#x50f;" k="20" />
+<hkern u1="&#x14f;" u2="&#x505;" k="11" />
+<hkern u1="&#x14f;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x14f;" u2="&#x47f;" k="15" />
+<hkern u1="&#x14f;" u2="&#x461;" k="16" />
+<hkern u1="&#x14f;" u2="&#x442;" k="22" />
+<hkern u1="&#x14f;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x14f;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x150;" g2="X.smcp" k="11" />
+<hkern u1="&#x150;" u2="&#x50e;" k="32" />
+<hkern u1="&#x150;" u2="&#x42c;" k="32" />
+<hkern u1="&#x150;" u2="&#x414;" k="33" />
+<hkern u1="&#x150;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x150;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x150;" u2="&#x39e;" k="13" />
+<hkern u1="&#x150;" u2="&#xc6;" k="33" />
+<hkern u1="&#x151;" u2="&#x50f;" k="20" />
+<hkern u1="&#x151;" u2="&#x505;" k="11" />
+<hkern u1="&#x151;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x151;" u2="&#x47f;" k="15" />
+<hkern u1="&#x151;" u2="&#x461;" k="16" />
+<hkern u1="&#x151;" u2="&#x442;" k="22" />
+<hkern u1="&#x151;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x151;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x155;" u2="w" k="-17" />
+<hkern u1="&#x155;" u2="t" k="-17" />
+<hkern u1="&#x155;" u2="f" k="-15" />
+<hkern u1="&#x157;" u2="w" k="-17" />
+<hkern u1="&#x157;" u2="t" k="-17" />
+<hkern u1="&#x157;" u2="f" k="-15" />
+<hkern u1="&#x159;" u2="w" k="-17" />
+<hkern u1="&#x159;" u2="t" k="-17" />
+<hkern u1="&#x159;" u2="f" k="-15" />
+<hkern u1="&#x162;" g2="Q.smcp" k="71" />
+<hkern u1="&#x162;" g2="S.smcp" k="68" />
+<hkern u1="&#x162;" g2="T.smcp" k="15" />
+<hkern u1="&#x162;" g2="W.smcp" k="15" />
+<hkern u1="&#x162;" g2="X.smcp" k="19" />
+<hkern u1="&#x162;" u2="&#x510;" k="14" />
+<hkern u1="&#x162;" u2="&#x50f;" k="111" />
+<hkern u1="&#x162;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x162;" u2="&#x50b;" k="133" />
+<hkern u1="&#x162;" u2="&#x507;" k="83" />
+<hkern u1="&#x162;" u2="&#x505;" k="110" />
+<hkern u1="&#x162;" u2="&#x500;" k="149" />
+<hkern u1="&#x162;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x162;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x162;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x162;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x162;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x162;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x162;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x162;" u2="&#x49d;" k="131" />
+<hkern u1="&#x162;" u2="&#x491;" k="104" />
+<hkern u1="&#x162;" u2="&#x48f;" k="127" />
+<hkern u1="&#x162;" u2="&#x47f;" k="38" />
+<hkern u1="&#x162;" u2="&#x47b;" k="153" />
+<hkern u1="&#x162;" u2="&#x461;" k="129" />
+<hkern u1="&#x162;" u2="&#x45f;" k="131" />
+<hkern u1="&#x162;" u2="&#x44f;" k="135" />
+<hkern u1="&#x162;" u2="&#x44d;" k="128" />
+<hkern u1="&#x162;" u2="&#x44b;" k="131" />
+<hkern u1="&#x162;" u2="&#x442;" k="78" />
+<hkern u1="&#x162;" u2="&#x437;" k="128" />
+<hkern u1="&#x162;" u2="&#x434;" k="140" />
+<hkern u1="&#x162;" u2="&#x432;" k="96" />
+<hkern u1="&#x162;" u2="&#x431;" k="28" />
+<hkern u1="&#x162;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x162;" u2="&#x414;" k="81" />
+<hkern u1="&#x162;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x162;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x162;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x162;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x162;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x162;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x162;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x162;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x162;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x162;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x162;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x162;" u2="&#xf8;" k="95" />
+<hkern u1="&#x162;" u2="&#xe6;" k="84" />
+<hkern u1="&#x162;" u2="&#xc6;" k="188" />
+<hkern u1="&#x162;" u2="&#xbb;" k="147" />
+<hkern u1="&#x162;" u2="&#xab;" k="151" />
+<hkern u1="&#x162;" u2="w" k="47" />
+<hkern u1="&#x162;" u2="r" k="65" />
+<hkern u1="&#x164;" g2="Q.smcp" k="71" />
+<hkern u1="&#x164;" g2="S.smcp" k="68" />
+<hkern u1="&#x164;" g2="T.smcp" k="15" />
+<hkern u1="&#x164;" g2="W.smcp" k="15" />
+<hkern u1="&#x164;" g2="X.smcp" k="19" />
+<hkern u1="&#x164;" u2="&#x510;" k="14" />
+<hkern u1="&#x164;" u2="&#x50f;" k="111" />
+<hkern u1="&#x164;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x164;" u2="&#x50b;" k="133" />
+<hkern u1="&#x164;" u2="&#x507;" k="83" />
+<hkern u1="&#x164;" u2="&#x505;" k="110" />
+<hkern u1="&#x164;" u2="&#x500;" k="149" />
+<hkern u1="&#x164;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x164;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x164;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x164;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x164;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x164;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x164;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x164;" u2="&#x49d;" k="131" />
+<hkern u1="&#x164;" u2="&#x491;" k="104" />
+<hkern u1="&#x164;" u2="&#x48f;" k="127" />
+<hkern u1="&#x164;" u2="&#x47f;" k="38" />
+<hkern u1="&#x164;" u2="&#x47b;" k="153" />
+<hkern u1="&#x164;" u2="&#x461;" k="129" />
+<hkern u1="&#x164;" u2="&#x45f;" k="131" />
+<hkern u1="&#x164;" u2="&#x44f;" k="135" />
+<hkern u1="&#x164;" u2="&#x44d;" k="128" />
+<hkern u1="&#x164;" u2="&#x44b;" k="131" />
+<hkern u1="&#x164;" u2="&#x442;" k="78" />
+<hkern u1="&#x164;" u2="&#x437;" k="128" />
+<hkern u1="&#x164;" u2="&#x434;" k="140" />
+<hkern u1="&#x164;" u2="&#x432;" k="96" />
+<hkern u1="&#x164;" u2="&#x431;" k="28" />
+<hkern u1="&#x164;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x164;" u2="&#x414;" k="81" />
+<hkern u1="&#x164;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x164;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x164;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x164;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x164;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x164;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x164;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x164;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x164;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x164;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x164;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x164;" u2="&#xf8;" k="95" />
+<hkern u1="&#x164;" u2="&#xe6;" k="84" />
+<hkern u1="&#x164;" u2="&#xc6;" k="188" />
+<hkern u1="&#x164;" u2="&#xbb;" k="147" />
+<hkern u1="&#x164;" u2="&#xab;" k="151" />
+<hkern u1="&#x164;" u2="w" k="47" />
+<hkern u1="&#x164;" u2="r" k="65" />
+<hkern u1="&#x166;" g2="Q.smcp" k="71" />
+<hkern u1="&#x166;" g2="S.smcp" k="68" />
+<hkern u1="&#x166;" g2="T.smcp" k="15" />
+<hkern u1="&#x166;" g2="W.smcp" k="15" />
+<hkern u1="&#x166;" g2="X.smcp" k="19" />
+<hkern u1="&#x166;" u2="&#x510;" k="14" />
+<hkern u1="&#x166;" u2="&#x50f;" k="111" />
+<hkern u1="&#x166;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x166;" u2="&#x50b;" k="133" />
+<hkern u1="&#x166;" u2="&#x507;" k="83" />
+<hkern u1="&#x166;" u2="&#x505;" k="110" />
+<hkern u1="&#x166;" u2="&#x500;" k="149" />
+<hkern u1="&#x166;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x166;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x166;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x166;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x166;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x166;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x166;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x166;" u2="&#x49d;" k="131" />
+<hkern u1="&#x166;" u2="&#x491;" k="104" />
+<hkern u1="&#x166;" u2="&#x48f;" k="127" />
+<hkern u1="&#x166;" u2="&#x47f;" k="38" />
+<hkern u1="&#x166;" u2="&#x47b;" k="153" />
+<hkern u1="&#x166;" u2="&#x461;" k="129" />
+<hkern u1="&#x166;" u2="&#x45f;" k="131" />
+<hkern u1="&#x166;" u2="&#x44f;" k="135" />
+<hkern u1="&#x166;" u2="&#x44d;" k="128" />
+<hkern u1="&#x166;" u2="&#x44b;" k="131" />
+<hkern u1="&#x166;" u2="&#x442;" k="78" />
+<hkern u1="&#x166;" u2="&#x437;" k="128" />
+<hkern u1="&#x166;" u2="&#x434;" k="140" />
+<hkern u1="&#x166;" u2="&#x432;" k="96" />
+<hkern u1="&#x166;" u2="&#x431;" k="28" />
+<hkern u1="&#x166;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x166;" u2="&#x414;" k="81" />
+<hkern u1="&#x166;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x166;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x166;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x166;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x166;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x166;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x166;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x166;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x166;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x166;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x166;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x166;" u2="&#xf8;" k="95" />
+<hkern u1="&#x166;" u2="&#xe6;" k="84" />
+<hkern u1="&#x166;" u2="&#xc6;" k="188" />
+<hkern u1="&#x166;" u2="&#xbb;" k="147" />
+<hkern u1="&#x166;" u2="&#xab;" k="151" />
+<hkern u1="&#x166;" u2="w" k="47" />
+<hkern u1="&#x166;" u2="r" k="65" />
+<hkern u1="&#x174;" g2="Q.smcp" k="25" />
+<hkern u1="&#x174;" u2="&#x7d;" k="-14" />
+<hkern u1="&#x174;" u2="r" k="21" />
+<hkern u1="&#x174;" u2="]" k="-12" />
+<hkern u1="&#x174;" u2="&#x29;" k="-15" />
+<hkern u1="&#x176;" g2="Q.smcp" k="53" />
+<hkern u1="&#x176;" g2="T.smcp" k="13" />
+<hkern u1="&#x176;" g2="W.smcp" k="13" />
+<hkern u1="&#x176;" g2="X.smcp" k="17" />
+<hkern u1="&#x176;" u2="&#x2022;" k="45" />
+<hkern u1="&#x176;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x176;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x176;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x176;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x176;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x176;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x176;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x176;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x176;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x176;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x176;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x176;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x176;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x176;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x176;" u2="&#xf8;" k="64" />
+<hkern u1="&#x176;" u2="&#xe6;" k="63" />
+<hkern u1="&#x176;" u2="&#xc6;" k="96" />
+<hkern u1="&#x176;" u2="&#xbb;" k="51" />
+<hkern u1="&#x176;" u2="&#xab;" k="82" />
+<hkern u1="&#x176;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x176;" u2="t" k="22" />
+<hkern u1="&#x176;" u2="r" k="40" />
+<hkern u1="&#x176;" u2="f" k="22" />
+<hkern u1="&#x176;" u2="]" k="-18" />
+<hkern u1="&#x176;" u2="&#x2a;" k="49" />
+<hkern u1="&#x176;" u2="&#x29;" k="-20" />
+<hkern u1="&#x176;" u2="&#x26;" k="30" />
+<hkern u1="&#x177;" u2="&#x47b;" k="15" />
+<hkern u1="&#x177;" u2="&#x434;" k="56" />
+<hkern u1="&#x177;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x177;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x177;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x177;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x177;" u2="f" k="-13" />
+<hkern u1="&#x178;" g2="Q.smcp" k="53" />
+<hkern u1="&#x178;" g2="T.smcp" k="13" />
+<hkern u1="&#x178;" g2="W.smcp" k="13" />
+<hkern u1="&#x178;" g2="X.smcp" k="17" />
+<hkern u1="&#x178;" u2="&#x2022;" k="45" />
+<hkern u1="&#x178;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x178;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x178;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x178;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x178;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x178;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x178;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x178;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x178;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x178;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x178;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x178;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x178;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x178;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x178;" u2="&#xf8;" k="64" />
+<hkern u1="&#x178;" u2="&#xe6;" k="63" />
+<hkern u1="&#x178;" u2="&#xc6;" k="96" />
+<hkern u1="&#x178;" u2="&#xbb;" k="51" />
+<hkern u1="&#x178;" u2="&#xab;" k="82" />
+<hkern u1="&#x178;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x178;" u2="t" k="22" />
+<hkern u1="&#x178;" u2="r" k="40" />
+<hkern u1="&#x178;" u2="f" k="22" />
+<hkern u1="&#x178;" u2="]" k="-18" />
+<hkern u1="&#x178;" u2="&#x2a;" k="49" />
+<hkern u1="&#x178;" u2="&#x29;" k="-20" />
+<hkern u1="&#x178;" u2="&#x26;" k="30" />
+<hkern u1="&#x179;" g2="Q.smcp" k="20" />
+<hkern u1="&#x179;" u2="&#x3c8;" k="28" />
+<hkern u1="&#x179;" u2="&#x3a6;" k="53" />
+<hkern u1="&#x179;" u2="w" k="27" />
+<hkern u1="&#x17b;" g2="Q.smcp" k="20" />
+<hkern u1="&#x17b;" u2="&#x3c8;" k="28" />
+<hkern u1="&#x17b;" u2="&#x3a6;" k="53" />
+<hkern u1="&#x17b;" u2="w" k="27" />
+<hkern u1="&#x17d;" g2="Q.smcp" k="20" />
+<hkern u1="&#x17d;" u2="&#x3c8;" k="28" />
+<hkern u1="&#x17d;" u2="&#x3a6;" k="53" />
+<hkern u1="&#x17d;" u2="w" k="27" />
+<hkern u1="&#x1fa;" g2="T.smcp" k="57" />
+<hkern u1="&#x1fa;" g2="U.smcp" k="15" />
+<hkern u1="&#x1fa;" g2="V.smcp" k="51" />
+<hkern u1="&#x1fa;" g2="W.smcp" k="35" />
+<hkern u1="&#x1fa;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1fa;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1fa;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1fa;" u2="&#x506;" k="54" />
+<hkern u1="&#x1fa;" u2="&#x504;" k="80" />
+<hkern u1="&#x1fa;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1fa;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1fa;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1fa;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1fa;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1fa;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1fa;" u2="&#x442;" k="54" />
+<hkern u1="&#x1fa;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1fa;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1fa;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1fa;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1fa;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1fa;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1fa;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1fa;" u2="w" k="33" />
+<hkern u1="&#x1fa;" u2="t" k="17" />
+<hkern u1="&#x1fa;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1fb;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1fb;" u2="&#x507;" k="13" />
+<hkern u1="&#x1fb;" u2="&#x505;" k="13" />
+<hkern u1="&#x1fb;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1fb;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1fb;" u2="&#x461;" k="15" />
+<hkern u1="&#x1fb;" u2="&#x442;" k="16" />
+<hkern u1="&#x2bc;" u2="w" k="-11" />
+<hkern u1="&#x386;" g2="T.smcp" k="57" />
+<hkern u1="&#x386;" g2="U.smcp" k="15" />
+<hkern u1="&#x386;" g2="V.smcp" k="51" />
+<hkern u1="&#x386;" g2="W.smcp" k="35" />
+<hkern u1="&#x386;" g2="Y.smcp" k="60" />
+<hkern u1="&#x386;" u2="&#x50f;" k="57" />
+<hkern u1="&#x386;" u2="&#x50e;" k="88" />
+<hkern u1="&#x386;" u2="&#x506;" k="54" />
+<hkern u1="&#x386;" u2="&#x504;" k="80" />
+<hkern u1="&#x386;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x386;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x386;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x386;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x386;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x386;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x386;" u2="&#x442;" k="54" />
+<hkern u1="&#x386;" u2="&#x42c;" k="59" />
+<hkern u1="&#x386;" u2="&#x414;" k="-19" />
+<hkern u1="&#x386;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x386;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x386;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x386;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x386;" u2="&#x1af;" k="18" />
+<hkern u1="&#x386;" u2="w" k="33" />
+<hkern u1="&#x386;" u2="t" k="17" />
+<hkern u1="&#x386;" u2="&#x3f;" k="80" />
+<hkern u1="&#x388;" g2="V.smcp" k="16" />
+<hkern u1="&#x388;" g2="W.smcp" k="19" />
+<hkern u1="&#x388;" g2="Y.smcp" k="16" />
+<hkern u1="&#x388;" u2="w" k="22" />
+<hkern u1="&#x388;" u2="f" k="18" />
+<hkern u1="&#x389;" u2="&#x50e;" k="28" />
+<hkern u1="&#x389;" u2="&#x506;" k="30" />
+<hkern u1="&#x389;" u2="&#x504;" k="29" />
+<hkern u1="&#x389;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x389;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x389;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x389;" u2="&#x434;" k="-21" />
+<hkern u1="&#x389;" u2="&#x414;" k="-21" />
+<hkern u1="&#x38a;" u2="&#x50e;" k="28" />
+<hkern u1="&#x38a;" u2="&#x506;" k="30" />
+<hkern u1="&#x38a;" u2="&#x504;" k="29" />
+<hkern u1="&#x38a;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x38a;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x38a;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x38a;" u2="&#x434;" k="-21" />
+<hkern u1="&#x38a;" u2="&#x414;" k="-21" />
+<hkern u1="&#x38c;" g2="X.smcp" k="11" />
+<hkern u1="&#x38c;" u2="&#x50e;" k="32" />
+<hkern u1="&#x38c;" u2="&#x42c;" k="32" />
+<hkern u1="&#x38c;" u2="&#x414;" k="33" />
+<hkern u1="&#x38c;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x38c;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x38c;" u2="&#x39e;" k="13" />
+<hkern u1="&#x38c;" u2="&#xc6;" k="33" />
+<hkern u1="&#x38e;" g2="Q.smcp" k="53" />
+<hkern u1="&#x38e;" g2="T.smcp" k="13" />
+<hkern u1="&#x38e;" g2="W.smcp" k="13" />
+<hkern u1="&#x38e;" g2="X.smcp" k="17" />
+<hkern u1="&#x38e;" u2="&#x2022;" k="45" />
+<hkern u1="&#x38e;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x38e;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x38e;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x38e;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x38e;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x38e;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x38e;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x38e;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x38e;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x38e;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x38e;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x38e;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x38e;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x38e;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x38e;" u2="&#xf8;" k="64" />
+<hkern u1="&#x38e;" u2="&#xe6;" k="63" />
+<hkern u1="&#x38e;" u2="&#xc6;" k="96" />
+<hkern u1="&#x38e;" u2="&#xbb;" k="51" />
+<hkern u1="&#x38e;" u2="&#xab;" k="82" />
+<hkern u1="&#x38e;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x38e;" u2="t" k="22" />
+<hkern u1="&#x38e;" u2="r" k="40" />
+<hkern u1="&#x38e;" u2="f" k="22" />
+<hkern u1="&#x38e;" u2="]" k="-18" />
+<hkern u1="&#x38e;" u2="&#x2a;" k="49" />
+<hkern u1="&#x38e;" u2="&#x29;" k="-20" />
+<hkern u1="&#x38e;" u2="&#x26;" k="30" />
+<hkern u1="&#x391;" g2="T.smcp" k="57" />
+<hkern u1="&#x391;" g2="U.smcp" k="15" />
+<hkern u1="&#x391;" g2="V.smcp" k="51" />
+<hkern u1="&#x391;" g2="W.smcp" k="35" />
+<hkern u1="&#x391;" g2="Y.smcp" k="60" />
+<hkern u1="&#x391;" u2="&#x50f;" k="57" />
+<hkern u1="&#x391;" u2="&#x50e;" k="88" />
+<hkern u1="&#x391;" u2="&#x506;" k="54" />
+<hkern u1="&#x391;" u2="&#x504;" k="80" />
+<hkern u1="&#x391;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x391;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x391;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x391;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x391;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x391;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x391;" u2="&#x442;" k="54" />
+<hkern u1="&#x391;" u2="&#x42c;" k="59" />
+<hkern u1="&#x391;" u2="&#x414;" k="-19" />
+<hkern u1="&#x391;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x391;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x391;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x391;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x391;" u2="&#x1af;" k="18" />
+<hkern u1="&#x391;" u2="w" k="33" />
+<hkern u1="&#x391;" u2="t" k="17" />
+<hkern u1="&#x391;" u2="&#x3f;" k="80" />
+<hkern u1="&#x392;" u2="&#x50e;" k="26" />
+<hkern u1="&#x392;" u2="&#x46a;" k="-11" />
+<hkern u1="&#x393;" u2="&#x510;" k="43" />
+<hkern u1="&#x393;" u2="&#x50f;" k="208" />
+<hkern u1="&#x393;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x393;" u2="&#x50b;" k="246" />
+<hkern u1="&#x393;" u2="&#x507;" k="161" />
+<hkern u1="&#x393;" u2="&#x505;" k="207" />
+<hkern u1="&#x393;" u2="&#x500;" k="273" />
+<hkern u1="&#x393;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x393;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x393;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x393;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x393;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x393;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x393;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x393;" u2="&#x49d;" k="242" />
+<hkern u1="&#x393;" u2="&#x491;" k="196" />
+<hkern u1="&#x393;" u2="&#x48f;" k="235" />
+<hkern u1="&#x393;" u2="&#x47f;" k="84" />
+<hkern u1="&#x393;" u2="&#x47b;" k="279" />
+<hkern u1="&#x393;" u2="&#x461;" k="239" />
+<hkern u1="&#x393;" u2="&#x45f;" k="242" />
+<hkern u1="&#x393;" u2="&#x44f;" k="249" />
+<hkern u1="&#x393;" u2="&#x44d;" k="237" />
+<hkern u1="&#x393;" u2="&#x44b;" k="242" />
+<hkern u1="&#x393;" u2="&#x442;" k="152" />
+<hkern u1="&#x393;" u2="&#x437;" k="237" />
+<hkern u1="&#x393;" u2="&#x434;" k="258" />
+<hkern u1="&#x393;" u2="&#x432;" k="183" />
+<hkern u1="&#x393;" u2="&#x431;" k="67" />
+<hkern u1="&#x393;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x393;" u2="&#x414;" k="157" />
+<hkern u1="&#x393;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x393;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x393;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x393;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x393;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x393;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x393;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x393;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x393;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x393;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x393;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x393;" u2="&#xf8;" k="181" />
+<hkern u1="&#x393;" u2="&#xe6;" k="163" />
+<hkern u1="&#x393;" u2="&#xc6;" k="340" />
+<hkern u1="&#x393;" u2="&#xbb;" k="270" />
+<hkern u1="&#x393;" u2="&#xab;" k="277" />
+<hkern u1="&#x393;" u2="w" k="99" />
+<hkern u1="&#x393;" u2="r" k="130" />
+<hkern u1="&#x394;" g2="T.smcp" k="57" />
+<hkern u1="&#x394;" g2="U.smcp" k="15" />
+<hkern u1="&#x394;" g2="V.smcp" k="51" />
+<hkern u1="&#x394;" g2="W.smcp" k="35" />
+<hkern u1="&#x394;" g2="Y.smcp" k="60" />
+<hkern u1="&#x394;" u2="&#x50f;" k="57" />
+<hkern u1="&#x394;" u2="&#x50e;" k="88" />
+<hkern u1="&#x394;" u2="&#x506;" k="54" />
+<hkern u1="&#x394;" u2="&#x504;" k="80" />
+<hkern u1="&#x394;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x394;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x394;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x394;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x394;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x394;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x394;" u2="&#x442;" k="54" />
+<hkern u1="&#x394;" u2="&#x42c;" k="59" />
+<hkern u1="&#x394;" u2="&#x414;" k="-19" />
+<hkern u1="&#x394;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x394;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x394;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x394;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x394;" u2="&#x1af;" k="18" />
+<hkern u1="&#x394;" u2="w" k="33" />
+<hkern u1="&#x394;" u2="t" k="17" />
+<hkern u1="&#x394;" u2="&#x3f;" k="80" />
+<hkern u1="&#x395;" g2="V.smcp" k="16" />
+<hkern u1="&#x395;" g2="W.smcp" k="19" />
+<hkern u1="&#x395;" g2="Y.smcp" k="16" />
+<hkern u1="&#x395;" u2="w" k="22" />
+<hkern u1="&#x395;" u2="f" k="18" />
+<hkern u1="&#x396;" g2="Q.smcp" k="20" />
+<hkern u1="&#x396;" u2="&#x3c8;" k="28" />
+<hkern u1="&#x396;" u2="&#x3a6;" k="53" />
+<hkern u1="&#x396;" u2="w" k="27" />
+<hkern u1="&#x397;" u2="&#x50e;" k="28" />
+<hkern u1="&#x397;" u2="&#x506;" k="30" />
+<hkern u1="&#x397;" u2="&#x504;" k="29" />
+<hkern u1="&#x397;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x397;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x397;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x397;" u2="&#x434;" k="-21" />
+<hkern u1="&#x397;" u2="&#x414;" k="-21" />
+<hkern u1="&#x398;" g2="X.smcp" k="11" />
+<hkern u1="&#x398;" u2="&#x50e;" k="32" />
+<hkern u1="&#x398;" u2="&#x42c;" k="32" />
+<hkern u1="&#x398;" u2="&#x414;" k="33" />
+<hkern u1="&#x398;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x398;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x398;" u2="&#x39e;" k="13" />
+<hkern u1="&#x398;" u2="&#xc6;" k="33" />
+<hkern u1="&#x399;" u2="&#x50e;" k="28" />
+<hkern u1="&#x399;" u2="&#x506;" k="30" />
+<hkern u1="&#x399;" u2="&#x504;" k="29" />
+<hkern u1="&#x399;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x399;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x399;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x399;" u2="&#x434;" k="-21" />
+<hkern u1="&#x399;" u2="&#x414;" k="-21" />
+<hkern u1="&#x39a;" g2="Q.smcp" k="25" />
+<hkern u1="&#x39a;" u2="&#x510;" k="17" />
+<hkern u1="&#x39a;" u2="&#x50f;" k="53" />
+<hkern u1="&#x39a;" u2="&#x507;" k="52" />
+<hkern u1="&#x39a;" u2="&#x505;" k="52" />
+<hkern u1="&#x39a;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x39a;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x39a;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x39a;" u2="&#x47f;" k="56" />
+<hkern u1="&#x39a;" u2="&#x47b;" k="46" />
+<hkern u1="&#x39a;" u2="&#x461;" k="78" />
+<hkern u1="&#x39a;" u2="&#x442;" k="71" />
+<hkern u1="&#x39a;" u2="&#x431;" k="41" />
+<hkern u1="&#x39a;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x39a;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x39a;" u2="w" k="63" />
+<hkern u1="&#x39b;" g2="T.smcp" k="57" />
+<hkern u1="&#x39b;" g2="U.smcp" k="15" />
+<hkern u1="&#x39b;" g2="V.smcp" k="51" />
+<hkern u1="&#x39b;" g2="W.smcp" k="35" />
+<hkern u1="&#x39b;" g2="Y.smcp" k="60" />
+<hkern u1="&#x39b;" u2="&#x50f;" k="57" />
+<hkern u1="&#x39b;" u2="&#x50e;" k="88" />
+<hkern u1="&#x39b;" u2="&#x506;" k="54" />
+<hkern u1="&#x39b;" u2="&#x504;" k="80" />
+<hkern u1="&#x39b;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x39b;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x39b;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x39b;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x39b;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x39b;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x39b;" u2="&#x442;" k="54" />
+<hkern u1="&#x39b;" u2="&#x42c;" k="59" />
+<hkern u1="&#x39b;" u2="&#x414;" k="-19" />
+<hkern u1="&#x39b;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x39b;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x39b;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x39b;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x39b;" u2="&#x1af;" k="18" />
+<hkern u1="&#x39b;" u2="w" k="33" />
+<hkern u1="&#x39b;" u2="t" k="17" />
+<hkern u1="&#x39b;" u2="&#x3f;" k="80" />
+<hkern u1="&#x39c;" u2="&#x50e;" k="28" />
+<hkern u1="&#x39c;" u2="&#x506;" k="30" />
+<hkern u1="&#x39c;" u2="&#x504;" k="29" />
+<hkern u1="&#x39c;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x39c;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x39c;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x39c;" u2="&#x434;" k="-21" />
+<hkern u1="&#x39c;" u2="&#x414;" k="-21" />
+<hkern u1="&#x39d;" u2="&#x50e;" k="28" />
+<hkern u1="&#x39d;" u2="&#x506;" k="30" />
+<hkern u1="&#x39d;" u2="&#x504;" k="29" />
+<hkern u1="&#x39d;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x39d;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x39d;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x39d;" u2="&#x434;" k="-21" />
+<hkern u1="&#x39d;" u2="&#x414;" k="-21" />
+<hkern u1="&#x39e;" u2="&#x1f4d;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ee2;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ee0;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ede;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1edc;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1eda;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ed8;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ed6;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ed4;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ed2;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ed0;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ece;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1ecc;" k="13" />
+<hkern u1="&#x39e;" u2="&#x50c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x4ea;" k="13" />
+<hkern u1="&#x39e;" u2="&#x4e8;" k="13" />
+<hkern u1="&#x39e;" u2="&#x4e6;" k="13" />
+<hkern u1="&#x39e;" u2="&#x4aa;" k="13" />
+<hkern u1="&#x39e;" u2="&#x4a8;" k="13" />
+<hkern u1="&#x39e;" u2="&#x480;" k="13" />
+<hkern u1="&#x39e;" u2="&#x47e;" k="13" />
+<hkern u1="&#x39e;" u2="&#x47c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x47a;" k="13" />
+<hkern u1="&#x39e;" u2="&#x478;" k="13" />
+<hkern u1="&#x39e;" u2="&#x472;" k="13" />
+<hkern u1="&#x39e;" u2="&#x460;" k="13" />
+<hkern u1="&#x39e;" u2="&#x421;" k="13" />
+<hkern u1="&#x39e;" u2="&#x41e;" k="13" />
+<hkern u1="&#x39e;" u2="&#x404;" k="13" />
+<hkern u1="&#x39e;" u2="&#x3bb;" k="-13" />
+<hkern u1="&#x39e;" u2="&#x39f;" k="13" />
+<hkern u1="&#x39e;" u2="&#x398;" k="13" />
+<hkern u1="&#x39e;" u2="&#x38c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1fe;" k="13" />
+<hkern u1="&#x39e;" u2="&#x1a0;" k="13" />
+<hkern u1="&#x39e;" u2="&#x152;" k="13" />
+<hkern u1="&#x39e;" u2="&#x150;" k="13" />
+<hkern u1="&#x39e;" u2="&#x14e;" k="13" />
+<hkern u1="&#x39e;" u2="&#x14c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x122;" k="13" />
+<hkern u1="&#x39e;" u2="&#x120;" k="13" />
+<hkern u1="&#x39e;" u2="&#x11e;" k="13" />
+<hkern u1="&#x39e;" u2="&#x11c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x10c;" k="13" />
+<hkern u1="&#x39e;" u2="&#x10a;" k="13" />
+<hkern u1="&#x39e;" u2="&#x108;" k="13" />
+<hkern u1="&#x39e;" u2="&#x106;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd8;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd6;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd5;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd4;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd3;" k="13" />
+<hkern u1="&#x39e;" u2="&#xd2;" k="13" />
+<hkern u1="&#x39e;" u2="&#xc7;" k="13" />
+<hkern u1="&#x39e;" u2="Q" k="13" />
+<hkern u1="&#x39e;" u2="O" k="13" />
+<hkern u1="&#x39e;" u2="G" k="13" />
+<hkern u1="&#x39e;" u2="C" k="13" />
+<hkern u1="&#x39f;" g2="X.smcp" k="11" />
+<hkern u1="&#x39f;" u2="&#x50e;" k="32" />
+<hkern u1="&#x39f;" u2="&#x42c;" k="32" />
+<hkern u1="&#x39f;" u2="&#x414;" k="33" />
+<hkern u1="&#x39f;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x39f;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x39f;" u2="&#x39e;" k="13" />
+<hkern u1="&#x39f;" u2="&#xc6;" k="33" />
+<hkern u1="&#x3a1;" u2="&#x500;" k="48" />
+<hkern u1="&#x3a1;" u2="&#x434;" k="171" />
+<hkern u1="&#x3a1;" u2="&#x414;" k="235" />
+<hkern u1="&#x3a1;" u2="&#x3c1;" k="56" />
+<hkern u1="&#x3a1;" u2="&#x3bb;" k="102" />
+<hkern u1="&#x3a1;" u2="&#x3b4;" k="40" />
+<hkern u1="&#x3a1;" u2="&#xc6;" k="293" />
+<hkern u1="&#x3a1;" u2="t" k="-14" />
+<hkern u1="&#x3a3;" u2="&#x1f4d;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ee2;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ee0;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ede;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1edc;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1eda;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ed8;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ed6;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ed4;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ed2;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ed0;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ece;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1ecc;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x50c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x4ea;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x4e8;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x4e6;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x4aa;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x4a8;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x480;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x47e;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x47c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x47a;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x478;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x472;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x460;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x421;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x41e;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x404;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x3bb;" k="-16" />
+<hkern u1="&#x3a3;" u2="&#x3a6;" k="62" />
+<hkern u1="&#x3a3;" u2="&#x39f;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x398;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x38c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1fe;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x1a0;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x152;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x150;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x14e;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x14c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x122;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x120;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x11e;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x11c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x10c;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x10a;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x108;" k="26" />
+<hkern u1="&#x3a3;" u2="&#x106;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd8;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd6;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd5;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd4;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd3;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xd2;" k="26" />
+<hkern u1="&#x3a3;" u2="&#xc7;" k="26" />
+<hkern u1="&#x3a3;" u2="Q" k="26" />
+<hkern u1="&#x3a3;" u2="O" k="26" />
+<hkern u1="&#x3a3;" u2="G" k="26" />
+<hkern u1="&#x3a3;" u2="C" k="26" />
+<hkern u1="&#x3a4;" g2="Q.smcp" k="71" />
+<hkern u1="&#x3a4;" g2="S.smcp" k="68" />
+<hkern u1="&#x3a4;" g2="T.smcp" k="15" />
+<hkern u1="&#x3a4;" g2="W.smcp" k="15" />
+<hkern u1="&#x3a4;" g2="X.smcp" k="19" />
+<hkern u1="&#x3a4;" u2="&#x510;" k="14" />
+<hkern u1="&#x3a4;" u2="&#x50f;" k="111" />
+<hkern u1="&#x3a4;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x3a4;" u2="&#x50b;" k="133" />
+<hkern u1="&#x3a4;" u2="&#x507;" k="83" />
+<hkern u1="&#x3a4;" u2="&#x505;" k="110" />
+<hkern u1="&#x3a4;" u2="&#x500;" k="149" />
+<hkern u1="&#x3a4;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x3a4;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x3a4;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x3a4;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x3a4;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x3a4;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x3a4;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x3a4;" u2="&#x49d;" k="131" />
+<hkern u1="&#x3a4;" u2="&#x491;" k="104" />
+<hkern u1="&#x3a4;" u2="&#x48f;" k="127" />
+<hkern u1="&#x3a4;" u2="&#x47f;" k="38" />
+<hkern u1="&#x3a4;" u2="&#x47b;" k="153" />
+<hkern u1="&#x3a4;" u2="&#x461;" k="129" />
+<hkern u1="&#x3a4;" u2="&#x45f;" k="131" />
+<hkern u1="&#x3a4;" u2="&#x44f;" k="135" />
+<hkern u1="&#x3a4;" u2="&#x44d;" k="128" />
+<hkern u1="&#x3a4;" u2="&#x44b;" k="131" />
+<hkern u1="&#x3a4;" u2="&#x442;" k="78" />
+<hkern u1="&#x3a4;" u2="&#x437;" k="128" />
+<hkern u1="&#x3a4;" u2="&#x434;" k="140" />
+<hkern u1="&#x3a4;" u2="&#x432;" k="96" />
+<hkern u1="&#x3a4;" u2="&#x431;" k="28" />
+<hkern u1="&#x3a4;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x3a4;" u2="&#x414;" k="81" />
+<hkern u1="&#x3a4;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x3a4;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x3a4;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x3a4;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x3a4;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x3a4;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x3a4;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x3a4;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x3a4;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x3a4;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x3a4;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x3a4;" u2="&#xf8;" k="95" />
+<hkern u1="&#x3a4;" u2="&#xe6;" k="84" />
+<hkern u1="&#x3a4;" u2="&#xc6;" k="188" />
+<hkern u1="&#x3a4;" u2="&#xbb;" k="147" />
+<hkern u1="&#x3a4;" u2="&#xab;" k="151" />
+<hkern u1="&#x3a4;" u2="w" k="47" />
+<hkern u1="&#x3a4;" u2="r" k="65" />
+<hkern u1="&#x3a5;" g2="Q.smcp" k="53" />
+<hkern u1="&#x3a5;" g2="T.smcp" k="13" />
+<hkern u1="&#x3a5;" g2="W.smcp" k="13" />
+<hkern u1="&#x3a5;" g2="X.smcp" k="17" />
+<hkern u1="&#x3a5;" u2="&#x2022;" k="45" />
+<hkern u1="&#x3a5;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x3a5;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x3a5;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x3a5;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x3a5;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x3a5;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x3a5;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x3a5;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x3a5;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x3a5;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x3a5;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x3a5;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x3a5;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x3a5;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x3a5;" u2="&#xf8;" k="64" />
+<hkern u1="&#x3a5;" u2="&#xe6;" k="63" />
+<hkern u1="&#x3a5;" u2="&#xc6;" k="96" />
+<hkern u1="&#x3a5;" u2="&#xbb;" k="51" />
+<hkern u1="&#x3a5;" u2="&#xab;" k="82" />
+<hkern u1="&#x3a5;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x3a5;" u2="t" k="22" />
+<hkern u1="&#x3a5;" u2="r" k="40" />
+<hkern u1="&#x3a5;" u2="f" k="22" />
+<hkern u1="&#x3a5;" u2="]" k="-18" />
+<hkern u1="&#x3a5;" u2="&#x2a;" k="49" />
+<hkern u1="&#x3a5;" u2="&#x29;" k="-20" />
+<hkern u1="&#x3a5;" u2="&#x26;" k="30" />
+<hkern u1="&#x3a6;" u2="&#x1ef8;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x1ef6;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x1ef4;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x1ef2;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x1eb6;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eb4;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eb2;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eb0;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eae;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eac;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1eaa;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1ea8;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1ea6;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1ea4;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1ea2;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1ea0;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1e00;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x4fc;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x4dc;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x4d2;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x4d0;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x4c1;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x4b2;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x4b0;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x4ae;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x496;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x466;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x425;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x416;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x410;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x3bb;" k="30" />
+<hkern u1="&#x3a6;" u2="&#x3ab;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x3a7;" k="46" />
+<hkern u1="&#x3a6;" u2="&#x3a5;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x39b;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x394;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x391;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x38e;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x386;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x1fa;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x178;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x176;" k="45" />
+<hkern u1="&#x3a6;" u2="&#x104;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x102;" k="28" />
+<hkern u1="&#x3a6;" u2="&#x100;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xdd;" k="45" />
+<hkern u1="&#x3a6;" u2="&#xc5;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xc4;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xc3;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xc2;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xc1;" k="28" />
+<hkern u1="&#x3a6;" u2="&#xc0;" k="28" />
+<hkern u1="&#x3a6;" u2="Y" k="45" />
+<hkern u1="&#x3a6;" u2="X" k="46" />
+<hkern u1="&#x3a6;" u2="A" k="28" />
+<hkern u1="&#x3a7;" g2="Q.smcp" k="23" />
+<hkern u1="&#x3a7;" u2="&#x510;" k="14" />
+<hkern u1="&#x3a7;" u2="&#x50f;" k="42" />
+<hkern u1="&#x3a7;" u2="&#x506;" k="-12" />
+<hkern u1="&#x3a7;" u2="&#x504;" k="-13" />
+<hkern u1="&#x3a7;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x3a7;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x3a7;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x3a7;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x3a7;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x3a7;" u2="&#x442;" k="41" />
+<hkern u1="&#x3a7;" u2="&#x431;" k="23" />
+<hkern u1="&#x3a7;" u2="&#x414;" k="-18" />
+<hkern u1="&#x3a7;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x3a7;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x3a7;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x3a7;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x3a7;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x3a7;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x3a7;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x3a7;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x3a8;" u2="&#x2026;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x2025;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x201e;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x201a;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x1eb6;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eb4;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eb2;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eb0;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eae;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eac;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1eaa;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1ea8;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1ea6;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1ea4;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1ea2;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1ea0;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1e00;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x4d2;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x4d0;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x466;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x410;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x3c1;" k="14" />
+<hkern u1="&#x3a8;" u2="&#x39b;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x394;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x391;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x386;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x1fa;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x104;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x102;" k="51" />
+<hkern u1="&#x3a8;" u2="&#x100;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc5;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc4;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc3;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc2;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc1;" k="51" />
+<hkern u1="&#x3a8;" u2="&#xc0;" k="51" />
+<hkern u1="&#x3a8;" u2="A" k="51" />
+<hkern u1="&#x3a8;" u2="&#x3a;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x2e;" k="186" />
+<hkern u1="&#x3a8;" u2="&#x2c;" k="186" />
+<hkern u1="&#x3aa;" u2="&#x50e;" k="28" />
+<hkern u1="&#x3aa;" u2="&#x506;" k="30" />
+<hkern u1="&#x3aa;" u2="&#x504;" k="29" />
+<hkern u1="&#x3aa;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x3aa;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x3aa;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x3aa;" u2="&#x434;" k="-21" />
+<hkern u1="&#x3aa;" u2="&#x414;" k="-21" />
+<hkern u1="&#x3ab;" g2="Q.smcp" k="53" />
+<hkern u1="&#x3ab;" g2="T.smcp" k="13" />
+<hkern u1="&#x3ab;" g2="W.smcp" k="13" />
+<hkern u1="&#x3ab;" g2="X.smcp" k="17" />
+<hkern u1="&#x3ab;" u2="&#x2022;" k="45" />
+<hkern u1="&#x3ab;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x3ab;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x3ab;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x3ab;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x3ab;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x3ab;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x3ab;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x3ab;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x3ab;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x3ab;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x3ab;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x3ab;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x3ab;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x3ab;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x3ab;" u2="&#xf8;" k="64" />
+<hkern u1="&#x3ab;" u2="&#xe6;" k="63" />
+<hkern u1="&#x3ab;" u2="&#xc6;" k="96" />
+<hkern u1="&#x3ab;" u2="&#xbb;" k="51" />
+<hkern u1="&#x3ab;" u2="&#xab;" k="82" />
+<hkern u1="&#x3ab;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x3ab;" u2="t" k="22" />
+<hkern u1="&#x3ab;" u2="r" k="40" />
+<hkern u1="&#x3ab;" u2="f" k="22" />
+<hkern u1="&#x3ab;" u2="]" k="-18" />
+<hkern u1="&#x3ab;" u2="&#x2a;" k="49" />
+<hkern u1="&#x3ab;" u2="&#x29;" k="-20" />
+<hkern u1="&#x3ab;" u2="&#x26;" k="30" />
+<hkern u1="&#x3b1;" u2="&#x3bb;" k="-14" />
+<hkern u1="&#x3b3;" u2="&#x47b;" k="15" />
+<hkern u1="&#x3b3;" u2="&#x434;" k="56" />
+<hkern u1="&#x3b3;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x3b3;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x3b3;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x3b3;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x3b3;" u2="f" k="-13" />
+<hkern u1="&#x3b4;" u2="&#x3c7;" k="20" />
+<hkern u1="&#x3b4;" u2="&#x3c4;" k="19" />
+<hkern u1="&#x3b6;" u2="&#x1ef9;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x1ef7;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x1ef5;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x1ef3;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x1ef1;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1eef;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1eed;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1eeb;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1ee9;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1ee7;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1ee5;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1ee3;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ee1;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1edf;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1edd;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1edb;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ed9;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ed7;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ed5;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ed3;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ed1;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ecf;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ecd;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x1ec7;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ec5;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ec3;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ec1;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ebf;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ebd;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1ebb;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1eb9;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1e3f;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x50d;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x503;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x502;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x501;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4fb;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4f9;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4f7;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4f3;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x4f1;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x4ef;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x4eb;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x4e9;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4e7;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x4e5;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4e3;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4db;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4d9;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4d7;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4ce;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4ca;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4c8;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4af;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x4ab;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4a9;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x4a5;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x4a3;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x49b;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x48b;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x481;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x47d;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x479;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x477;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x475;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x473;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x45e;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x45d;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x45c;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x45a;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x454;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x453;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x451;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x450;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x44e;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x44c;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x449;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x448;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x446;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x444;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x443;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x441;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x440;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x43f;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x43e;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x43d;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x43c;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x43a;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x439;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x438;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x435;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x433;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x3cd;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x3cc;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x3cb;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x3c9;" k="37" />
+<hkern u1="&#x3b6;" u2="&#x3c8;" k="44" />
+<hkern u1="&#x3b6;" u2="&#x3c6;" k="50" />
+<hkern u1="&#x3b6;" u2="&#x3c5;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x3c4;" k="29" />
+<hkern u1="&#x3b6;" u2="&#x3c3;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x3c2;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x3c0;" k="25" />
+<hkern u1="&#x3b6;" u2="&#x3bf;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x3be;" k="16" />
+<hkern u1="&#x3b6;" u2="&#x3bd;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x3b9;" k="23" />
+<hkern u1="&#x3b6;" u2="&#x3b8;" k="21" />
+<hkern u1="&#x3b6;" u2="&#x3b7;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x3b5;" k="26" />
+<hkern u1="&#x3b6;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x3b6;" u2="&#x3b3;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x3b1;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x3b0;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x3ae;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x3ac;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x1b0;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x1a1;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x177;" k="31" />
+<hkern u1="&#x3b6;" u2="&#x173;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x171;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x16f;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x16d;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x16b;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x169;" k="35" />
+<hkern u1="&#x3b6;" u2="&#x153;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x151;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x14f;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x14d;" k="42" />
+<hkern u1="&#x3b6;" u2="&#x149;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x148;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x146;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x144;" k="62" />
+<hkern u1="&#x3b6;" u2="&#x123;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x121;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x11f;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x11d;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x11b;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x119;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x117;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x115;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x113;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x10f;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x10d;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x10b;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x109;" k="36" />
+<hkern u1="&#x3b6;" u2="&#x107;" k="36" />
+<hkern u1="&#x3b6;" u2="&#xff;" k="31" />
+<hkern u1="&#x3b6;" u2="&#xfd;" k="31" />
+<hkern u1="&#x3b6;" u2="&#xfc;" k="35" />
+<hkern u1="&#x3b6;" u2="&#xfb;" k="35" />
+<hkern u1="&#x3b6;" u2="&#xfa;" k="35" />
+<hkern u1="&#x3b6;" u2="&#xf9;" k="35" />
+<hkern u1="&#x3b6;" u2="&#xf6;" k="42" />
+<hkern u1="&#x3b6;" u2="&#xf5;" k="42" />
+<hkern u1="&#x3b6;" u2="&#xf4;" k="42" />
+<hkern u1="&#x3b6;" u2="&#xf3;" k="42" />
+<hkern u1="&#x3b6;" u2="&#xf2;" k="42" />
+<hkern u1="&#x3b6;" u2="&#xf1;" k="62" />
+<hkern u1="&#x3b6;" u2="&#xeb;" k="36" />
+<hkern u1="&#x3b6;" u2="&#xea;" k="36" />
+<hkern u1="&#x3b6;" u2="&#xe9;" k="36" />
+<hkern u1="&#x3b6;" u2="&#xe8;" k="36" />
+<hkern u1="&#x3b6;" u2="&#xe7;" k="36" />
+<hkern u1="&#x3b6;" u2="y" k="31" />
+<hkern u1="&#x3b6;" u2="v" k="31" />
+<hkern u1="&#x3b6;" u2="u" k="35" />
+<hkern u1="&#x3b6;" u2="q" k="36" />
+<hkern u1="&#x3b6;" u2="p" k="62" />
+<hkern u1="&#x3b6;" u2="o" k="42" />
+<hkern u1="&#x3b6;" u2="n" k="62" />
+<hkern u1="&#x3b6;" u2="m" k="62" />
+<hkern u1="&#x3b6;" u2="g" k="36" />
+<hkern u1="&#x3b6;" u2="e" k="36" />
+<hkern u1="&#x3b6;" u2="d" k="36" />
+<hkern u1="&#x3b6;" u2="c" k="36" />
+<hkern u1="&#x3b9;" u2="&#x2033;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x2032;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x201d;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x201c;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x201b;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x2019;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x2018;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x1ef9;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x1ef7;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x1ef5;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x1ef3;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x1ef1;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1eef;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1eed;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1eeb;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1ee9;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1ee7;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1ee5;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1ee3;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1edf;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1edd;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1edb;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ec7;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ec5;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ec3;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ec1;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ebf;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ebd;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1ebb;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x1eb9;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x50d;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x503;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x502;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x501;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4f3;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x4f1;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x4ef;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x4e9;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4db;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4d9;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4d7;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4af;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x4ab;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x4a9;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x481;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x47d;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x479;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x477;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x475;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x45e;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x454;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x451;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x450;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x444;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x443;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x441;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x435;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x3cd;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x3cb;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x3b9;" u2="&#x3c5;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x3c4;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x3c3;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x3c2;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x3c0;" k="22" />
+<hkern u1="&#x3b9;" u2="&#x3bd;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x3bb;" k="-15" />
+<hkern u1="&#x3b9;" u2="&#x3b8;" k="20" />
+<hkern u1="&#x3b9;" u2="&#x3b3;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x3b1;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x3b0;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x3ac;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x2bc;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x1b0;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x1a1;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x177;" k="36" />
+<hkern u1="&#x3b9;" u2="&#x173;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x171;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x16f;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x16d;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x16b;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x169;" k="17" />
+<hkern u1="&#x3b9;" u2="&#x153;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x123;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x121;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x11f;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x11d;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x11b;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x119;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x117;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x115;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x113;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x10f;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x10d;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x10b;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x109;" k="16" />
+<hkern u1="&#x3b9;" u2="&#x107;" k="16" />
+<hkern u1="&#x3b9;" u2="&#xff;" k="36" />
+<hkern u1="&#x3b9;" u2="&#xfd;" k="36" />
+<hkern u1="&#x3b9;" u2="&#xfc;" k="17" />
+<hkern u1="&#x3b9;" u2="&#xfb;" k="17" />
+<hkern u1="&#x3b9;" u2="&#xfa;" k="17" />
+<hkern u1="&#x3b9;" u2="&#xf9;" k="17" />
+<hkern u1="&#x3b9;" u2="&#xeb;" k="16" />
+<hkern u1="&#x3b9;" u2="&#xea;" k="16" />
+<hkern u1="&#x3b9;" u2="&#xe9;" k="16" />
+<hkern u1="&#x3b9;" u2="&#xe8;" k="16" />
+<hkern u1="&#x3b9;" u2="&#xe7;" k="16" />
+<hkern u1="&#x3b9;" u2="y" k="36" />
+<hkern u1="&#x3b9;" u2="v" k="36" />
+<hkern u1="&#x3b9;" u2="u" k="17" />
+<hkern u1="&#x3b9;" u2="q" k="16" />
+<hkern u1="&#x3b9;" u2="g" k="16" />
+<hkern u1="&#x3b9;" u2="e" k="16" />
+<hkern u1="&#x3b9;" u2="d" k="16" />
+<hkern u1="&#x3b9;" u2="c" k="16" />
+<hkern u1="&#x3b9;" u2="&#x27;" k="38" />
+<hkern u1="&#x3b9;" u2="&#x22;" k="38" />
+<hkern u1="&#x3bb;" u2="&#x2033;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x2032;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x201d;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x201c;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x201b;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x2019;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x2018;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x1ef9;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x1ef7;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x1ef5;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x1ef3;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x1ef1;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1eef;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1eed;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1eeb;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1ee9;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1ee7;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x1ee5;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x4f3;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x4f1;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x4ef;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x4af;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x477;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x475;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x45e;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x443;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x3cd;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x3cb;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x3c7;" k="38" />
+<hkern u1="&#x3bb;" u2="&#x3c5;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x3c4;" k="66" />
+<hkern u1="&#x3bb;" u2="&#x3c0;" k="20" />
+<hkern u1="&#x3bb;" u2="&#x3bd;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x3bb;" k="-16" />
+<hkern u1="&#x3bb;" u2="&#x3b8;" k="18" />
+<hkern u1="&#x3bb;" u2="&#x3b3;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x3b0;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x2bc;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x1b0;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x177;" k="59" />
+<hkern u1="&#x3bb;" u2="&#x173;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x171;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x16f;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x16d;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x16b;" k="15" />
+<hkern u1="&#x3bb;" u2="&#x169;" k="15" />
+<hkern u1="&#x3bb;" u2="&#xff;" k="59" />
+<hkern u1="&#x3bb;" u2="&#xfd;" k="59" />
+<hkern u1="&#x3bb;" u2="&#xfc;" k="15" />
+<hkern u1="&#x3bb;" u2="&#xfb;" k="15" />
+<hkern u1="&#x3bb;" u2="&#xfa;" k="15" />
+<hkern u1="&#x3bb;" u2="&#xf9;" k="15" />
+<hkern u1="&#x3bb;" u2="y" k="59" />
+<hkern u1="&#x3bb;" u2="v" k="59" />
+<hkern u1="&#x3bb;" u2="u" k="15" />
+<hkern u1="&#x3bb;" u2="f" k="23" />
+<hkern u1="&#x3bb;" u2="&#x27;" k="96" />
+<hkern u1="&#x3bb;" u2="&#x22;" k="96" />
+<hkern u1="&#x3bd;" u2="&#x47b;" k="15" />
+<hkern u1="&#x3bd;" u2="&#x434;" k="56" />
+<hkern u1="&#x3bd;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x3bd;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x3bd;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x3bd;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x3bd;" u2="f" k="-13" />
+<hkern u1="&#x3be;" u2="&#x1ee3;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1edf;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1edd;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1edb;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ec7;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ec5;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ec3;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ec1;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ebf;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ebd;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1ebb;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1eb9;" k="25" />
+<hkern u1="&#x3be;" u2="&#x50d;" k="25" />
+<hkern u1="&#x3be;" u2="&#x503;" k="25" />
+<hkern u1="&#x3be;" u2="&#x502;" k="25" />
+<hkern u1="&#x3be;" u2="&#x501;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4e9;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4db;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4d9;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4d7;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4ab;" k="25" />
+<hkern u1="&#x3be;" u2="&#x4a9;" k="25" />
+<hkern u1="&#x3be;" u2="&#x481;" k="25" />
+<hkern u1="&#x3be;" u2="&#x47d;" k="25" />
+<hkern u1="&#x3be;" u2="&#x479;" k="25" />
+<hkern u1="&#x3be;" u2="&#x454;" k="25" />
+<hkern u1="&#x3be;" u2="&#x451;" k="25" />
+<hkern u1="&#x3be;" u2="&#x450;" k="25" />
+<hkern u1="&#x3be;" u2="&#x444;" k="25" />
+<hkern u1="&#x3be;" u2="&#x441;" k="25" />
+<hkern u1="&#x3be;" u2="&#x435;" k="25" />
+<hkern u1="&#x3be;" u2="&#x3c3;" k="25" />
+<hkern u1="&#x3be;" u2="&#x3c2;" k="25" />
+<hkern u1="&#x3be;" u2="&#x3bb;" k="-15" />
+<hkern u1="&#x3be;" u2="&#x3b1;" k="25" />
+<hkern u1="&#x3be;" u2="&#x3ac;" k="25" />
+<hkern u1="&#x3be;" u2="&#x1a1;" k="25" />
+<hkern u1="&#x3be;" u2="&#x153;" k="25" />
+<hkern u1="&#x3be;" u2="&#x123;" k="25" />
+<hkern u1="&#x3be;" u2="&#x121;" k="25" />
+<hkern u1="&#x3be;" u2="&#x11f;" k="25" />
+<hkern u1="&#x3be;" u2="&#x11d;" k="25" />
+<hkern u1="&#x3be;" u2="&#x11b;" k="25" />
+<hkern u1="&#x3be;" u2="&#x119;" k="25" />
+<hkern u1="&#x3be;" u2="&#x117;" k="25" />
+<hkern u1="&#x3be;" u2="&#x115;" k="25" />
+<hkern u1="&#x3be;" u2="&#x113;" k="25" />
+<hkern u1="&#x3be;" u2="&#x10f;" k="25" />
+<hkern u1="&#x3be;" u2="&#x10d;" k="25" />
+<hkern u1="&#x3be;" u2="&#x10b;" k="25" />
+<hkern u1="&#x3be;" u2="&#x109;" k="25" />
+<hkern u1="&#x3be;" u2="&#x107;" k="25" />
+<hkern u1="&#x3be;" u2="&#xeb;" k="25" />
+<hkern u1="&#x3be;" u2="&#xea;" k="25" />
+<hkern u1="&#x3be;" u2="&#xe9;" k="25" />
+<hkern u1="&#x3be;" u2="&#xe8;" k="25" />
+<hkern u1="&#x3be;" u2="&#xe7;" k="25" />
+<hkern u1="&#x3be;" u2="q" k="25" />
+<hkern u1="&#x3be;" u2="g" k="25" />
+<hkern u1="&#x3be;" u2="e" k="25" />
+<hkern u1="&#x3be;" u2="d" k="25" />
+<hkern u1="&#x3be;" u2="c" k="25" />
+<hkern u1="&#x3bf;" u2="&#x50f;" k="20" />
+<hkern u1="&#x3bf;" u2="&#x505;" k="11" />
+<hkern u1="&#x3bf;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x3bf;" u2="&#x47f;" k="15" />
+<hkern u1="&#x3bf;" u2="&#x461;" k="16" />
+<hkern u1="&#x3bf;" u2="&#x442;" k="22" />
+<hkern u1="&#x3bf;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x3bf;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x3c1;" u2="&#x50f;" k="20" />
+<hkern u1="&#x3c1;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x3c1;" u2="&#x442;" k="21" />
+<hkern u1="&#x3c1;" u2="&#x434;" k="18" />
+<hkern u1="&#x3c1;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x3c1;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x3c3;" u2="&#x3c4;" k="-11" />
+<hkern u1="&#x3c4;" g2="Q.smcp" k="20" />
+<hkern u1="&#x3c4;" g2="S.smcp" k="11" />
+<hkern u1="&#x3c4;" g2="T.smcp" k="-14" />
+<hkern u1="&#x3c4;" g2="V.smcp" k="-13" />
+<hkern u1="&#x3c4;" g2="Y.smcp" k="-13" />
+<hkern u1="&#x3c4;" u2="&#x2033;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x2032;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x201d;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x201c;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x201b;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x2019;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x2018;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x1ef9;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x1ef7;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x1ef5;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x1ef3;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x1ee3;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ee1;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1edf;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1edd;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1edb;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ed9;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ed7;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ed5;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ed3;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ed1;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ecf;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ecd;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x1ec7;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ec5;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ec3;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ec1;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ebf;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ebd;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1ebb;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x1eb9;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x50d;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x503;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x502;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x501;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4f3;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x4f1;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x4ef;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x4eb;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x4e9;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4e7;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x4db;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4d9;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4d7;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4af;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x4ab;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x4a9;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x481;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x47d;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x479;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x477;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x475;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x473;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x45e;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x454;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x451;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x450;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x444;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x443;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x441;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x43e;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x435;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x3cc;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x3c3;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x3c2;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x3bf;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x3bd;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x3b4;" k="19" />
+<hkern u1="&#x3c4;" u2="&#x3b3;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x3b1;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x3ac;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x2bc;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x1a1;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x177;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#x153;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x151;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x14f;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x14d;" k="22" />
+<hkern u1="&#x3c4;" u2="&#x123;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x121;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x11f;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x11d;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x11b;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x119;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x117;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x115;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x113;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x10f;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x10d;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x10b;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x109;" k="24" />
+<hkern u1="&#x3c4;" u2="&#x107;" k="24" />
+<hkern u1="&#x3c4;" u2="&#xff;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#xfd;" k="-11" />
+<hkern u1="&#x3c4;" u2="&#xf6;" k="22" />
+<hkern u1="&#x3c4;" u2="&#xf5;" k="22" />
+<hkern u1="&#x3c4;" u2="&#xf4;" k="22" />
+<hkern u1="&#x3c4;" u2="&#xf3;" k="22" />
+<hkern u1="&#x3c4;" u2="&#xf2;" k="22" />
+<hkern u1="&#x3c4;" u2="&#xeb;" k="24" />
+<hkern u1="&#x3c4;" u2="&#xea;" k="24" />
+<hkern u1="&#x3c4;" u2="&#xe9;" k="24" />
+<hkern u1="&#x3c4;" u2="&#xe8;" k="24" />
+<hkern u1="&#x3c4;" u2="&#xe7;" k="24" />
+<hkern u1="&#x3c4;" u2="y" k="-11" />
+<hkern u1="&#x3c4;" u2="v" k="-11" />
+<hkern u1="&#x3c4;" u2="q" k="24" />
+<hkern u1="&#x3c4;" u2="o" k="22" />
+<hkern u1="&#x3c4;" u2="g" k="24" />
+<hkern u1="&#x3c4;" u2="f" k="-12" />
+<hkern u1="&#x3c4;" u2="e" k="24" />
+<hkern u1="&#x3c4;" u2="d" k="24" />
+<hkern u1="&#x3c4;" u2="c" k="24" />
+<hkern u1="&#x3c4;" u2="&#x27;" k="-12" />
+<hkern u1="&#x3c4;" u2="&#x22;" k="-12" />
+<hkern u1="&#x3c6;" u2="&#x4fd;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x4dd;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x4c2;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x4b3;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x497;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x445;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x436;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x3c7;" k="31" />
+<hkern u1="&#x3c6;" u2="&#x17e;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x17c;" k="19" />
+<hkern u1="&#x3c6;" u2="&#x17a;" k="19" />
+<hkern u1="&#x3c6;" u2="z" k="19" />
+<hkern u1="&#x3c6;" u2="x" k="19" />
+<hkern u1="&#x3c7;" u2="&#x2033;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x2032;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x201d;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x201c;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x201b;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x2019;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x2018;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x1ee3;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ee1;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1edf;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1edd;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1edb;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ed9;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ed7;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ed5;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ed3;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ed1;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ecf;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ecd;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x1ec7;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ec5;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ec3;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ec1;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ebf;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ebd;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1ebb;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x1eb9;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x50d;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x503;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x502;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x501;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4eb;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x4e9;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4e7;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x4db;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4d9;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4d7;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4ab;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x4a9;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x481;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x47d;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x479;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x473;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x454;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x451;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x450;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x444;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x441;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x43e;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x435;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x3cc;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x3c9;" k="17" />
+<hkern u1="&#x3c7;" u2="&#x3c7;" k="-15" />
+<hkern u1="&#x3c7;" u2="&#x3c6;" k="15" />
+<hkern u1="&#x3c7;" u2="&#x3c3;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x3c2;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x3bf;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x3b5;" k="14" />
+<hkern u1="&#x3c7;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x3c7;" u2="&#x3b1;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x3ac;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x2bc;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x1a1;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x153;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x151;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x14f;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x14d;" k="23" />
+<hkern u1="&#x3c7;" u2="&#x123;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x121;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x11f;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x11d;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x11b;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x119;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x117;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x115;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x113;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x10f;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x10d;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x10b;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x109;" k="21" />
+<hkern u1="&#x3c7;" u2="&#x107;" k="21" />
+<hkern u1="&#x3c7;" u2="&#xf6;" k="23" />
+<hkern u1="&#x3c7;" u2="&#xf5;" k="23" />
+<hkern u1="&#x3c7;" u2="&#xf4;" k="23" />
+<hkern u1="&#x3c7;" u2="&#xf3;" k="23" />
+<hkern u1="&#x3c7;" u2="&#xf2;" k="23" />
+<hkern u1="&#x3c7;" u2="&#xeb;" k="21" />
+<hkern u1="&#x3c7;" u2="&#xea;" k="21" />
+<hkern u1="&#x3c7;" u2="&#xe9;" k="21" />
+<hkern u1="&#x3c7;" u2="&#xe8;" k="21" />
+<hkern u1="&#x3c7;" u2="&#xe7;" k="21" />
+<hkern u1="&#x3c7;" u2="q" k="21" />
+<hkern u1="&#x3c7;" u2="o" k="23" />
+<hkern u1="&#x3c7;" u2="g" k="21" />
+<hkern u1="&#x3c7;" u2="f" k="-11" />
+<hkern u1="&#x3c7;" u2="e" k="21" />
+<hkern u1="&#x3c7;" u2="d" k="21" />
+<hkern u1="&#x3c7;" u2="c" k="21" />
+<hkern u1="&#x3c7;" u2="&#x27;" k="-11" />
+<hkern u1="&#x3c7;" u2="&#x22;" k="-11" />
+<hkern u1="&#x3c8;" u2="&#x4fd;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x4dd;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x4c2;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x4b3;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x497;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x445;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x436;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x17e;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x17c;" k="14" />
+<hkern u1="&#x3c8;" u2="&#x17a;" k="14" />
+<hkern u1="&#x3c8;" u2="z" k="14" />
+<hkern u1="&#x3c8;" u2="x" k="14" />
+<hkern u1="&#x3c9;" u2="&#x1ef9;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x1ef7;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x1ef5;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x1ef3;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x4fd;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x4f3;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x4f1;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x4ef;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x4dd;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x4c2;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x4b3;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x4af;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x497;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x477;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x475;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x45e;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x445;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x443;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x436;" k="14" />
+<hkern u1="&#x3c9;" u2="&#x3bd;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x3b3;" k="12" />
+<hkern u1="&#x3c9;" u2="&#x17e;" k="13" />
+<hkern u1="&#x3c9;" u2="&#x17c;" k="13" />
+<hkern u1="&#x3c9;" u2="&#x17a;" k="13" />
+<hkern u1="&#x3c9;" u2="&#x177;" k="12" />
+<hkern u1="&#x3c9;" u2="&#xff;" k="12" />
+<hkern u1="&#x3c9;" u2="&#xfd;" k="12" />
+<hkern u1="&#x3c9;" u2="z" k="13" />
+<hkern u1="&#x3c9;" u2="y" k="12" />
+<hkern u1="&#x3c9;" u2="x" k="14" />
+<hkern u1="&#x3c9;" u2="v" k="12" />
+<hkern u1="&#x3cc;" u2="&#x50f;" k="20" />
+<hkern u1="&#x3cc;" u2="&#x505;" k="11" />
+<hkern u1="&#x3cc;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x3cc;" u2="&#x47f;" k="15" />
+<hkern u1="&#x3cc;" u2="&#x461;" k="16" />
+<hkern u1="&#x3cc;" u2="&#x442;" k="22" />
+<hkern u1="&#x3cc;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x3cc;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x400;" g2="V.smcp" k="16" />
+<hkern u1="&#x400;" g2="W.smcp" k="19" />
+<hkern u1="&#x400;" g2="Y.smcp" k="16" />
+<hkern u1="&#x400;" u2="w" k="22" />
+<hkern u1="&#x400;" u2="f" k="18" />
+<hkern u1="&#x401;" g2="V.smcp" k="16" />
+<hkern u1="&#x401;" g2="W.smcp" k="19" />
+<hkern u1="&#x401;" g2="Y.smcp" k="16" />
+<hkern u1="&#x401;" u2="w" k="22" />
+<hkern u1="&#x401;" u2="f" k="18" />
+<hkern u1="&#x402;" u2="&#x2033;" k="54" />
+<hkern u1="&#x402;" u2="&#x2032;" k="54" />
+<hkern u1="&#x402;" u2="&#x201d;" k="54" />
+<hkern u1="&#x402;" u2="&#x201c;" k="54" />
+<hkern u1="&#x402;" u2="&#x201b;" k="54" />
+<hkern u1="&#x402;" u2="&#x2019;" k="54" />
+<hkern u1="&#x402;" u2="&#x2018;" k="54" />
+<hkern u1="&#x402;" u2="&#x1ef9;" k="26" />
+<hkern u1="&#x402;" u2="&#x1ef8;" k="45" />
+<hkern u1="&#x402;" u2="&#x1ef7;" k="26" />
+<hkern u1="&#x402;" u2="&#x1ef6;" k="45" />
+<hkern u1="&#x402;" u2="&#x1ef5;" k="26" />
+<hkern u1="&#x402;" u2="&#x1ef4;" k="45" />
+<hkern u1="&#x402;" u2="&#x1ef3;" k="26" />
+<hkern u1="&#x402;" u2="&#x1ef2;" k="45" />
+<hkern u1="&#x402;" u2="&#x50f;" k="55" />
+<hkern u1="&#x402;" u2="&#x50e;" k="153" />
+<hkern u1="&#x402;" u2="&#x506;" k="25" />
+<hkern u1="&#x402;" u2="&#x505;" k="11" />
+<hkern u1="&#x402;" u2="&#x504;" k="44" />
+<hkern u1="&#x402;" u2="&#x4fd;" k="17" />
+<hkern u1="&#x402;" u2="&#x4fc;" k="12" />
+<hkern u1="&#x402;" u2="&#x4f4;" k="31" />
+<hkern u1="&#x402;" u2="&#x4f3;" k="26" />
+<hkern u1="&#x402;" u2="&#x4f2;" k="19" />
+<hkern u1="&#x402;" u2="&#x4f1;" k="26" />
+<hkern u1="&#x402;" u2="&#x4f0;" k="19" />
+<hkern u1="&#x402;" u2="&#x4ef;" k="26" />
+<hkern u1="&#x402;" u2="&#x4ee;" k="19" />
+<hkern u1="&#x402;" u2="&#x4dd;" k="17" />
+<hkern u1="&#x402;" u2="&#x4dc;" k="12" />
+<hkern u1="&#x402;" u2="&#x4cb;" k="31" />
+<hkern u1="&#x402;" u2="&#x4c2;" k="17" />
+<hkern u1="&#x402;" u2="&#x4c1;" k="12" />
+<hkern u1="&#x402;" u2="&#x4b8;" k="31" />
+<hkern u1="&#x402;" u2="&#x4b6;" k="31" />
+<hkern u1="&#x402;" u2="&#x4b4;" k="46" />
+<hkern u1="&#x402;" u2="&#x4b3;" k="17" />
+<hkern u1="&#x402;" u2="&#x4b2;" k="12" />
+<hkern u1="&#x402;" u2="&#x4b0;" k="45" />
+<hkern u1="&#x402;" u2="&#x4af;" k="26" />
+<hkern u1="&#x402;" u2="&#x4ae;" k="45" />
+<hkern u1="&#x402;" u2="&#x4ac;" k="46" />
+<hkern u1="&#x402;" u2="&#x4a1;" k="60" />
+<hkern u1="&#x402;" u2="&#x4a0;" k="46" />
+<hkern u1="&#x402;" u2="&#x497;" k="17" />
+<hkern u1="&#x402;" u2="&#x496;" k="12" />
+<hkern u1="&#x402;" u2="&#x47f;" k="29" />
+<hkern u1="&#x402;" u2="&#x477;" k="26" />
+<hkern u1="&#x402;" u2="&#x476;" k="44" />
+<hkern u1="&#x402;" u2="&#x475;" k="26" />
+<hkern u1="&#x402;" u2="&#x474;" k="44" />
+<hkern u1="&#x402;" u2="&#x461;" k="27" />
+<hkern u1="&#x402;" u2="&#x45e;" k="26" />
+<hkern u1="&#x402;" u2="&#x445;" k="17" />
+<hkern u1="&#x402;" u2="&#x443;" k="26" />
+<hkern u1="&#x402;" u2="&#x442;" k="55" />
+<hkern u1="&#x402;" u2="&#x436;" k="17" />
+<hkern u1="&#x402;" u2="&#x42c;" k="44" />
+<hkern u1="&#x402;" u2="&#x427;" k="31" />
+<hkern u1="&#x402;" u2="&#x425;" k="12" />
+<hkern u1="&#x402;" u2="&#x423;" k="19" />
+<hkern u1="&#x402;" u2="&#x422;" k="46" />
+<hkern u1="&#x402;" u2="&#x416;" k="12" />
+<hkern u1="&#x402;" u2="&#x40e;" k="19" />
+<hkern u1="&#x402;" u2="&#x40b;" k="46" />
+<hkern u1="&#x402;" u2="&#x402;" k="46" />
+<hkern u1="&#x402;" u2="&#x3bd;" k="26" />
+<hkern u1="&#x402;" u2="&#x3b3;" k="26" />
+<hkern u1="&#x402;" u2="&#x3ab;" k="45" />
+<hkern u1="&#x402;" u2="&#x3a7;" k="12" />
+<hkern u1="&#x402;" u2="&#x3a5;" k="45" />
+<hkern u1="&#x402;" u2="&#x38e;" k="45" />
+<hkern u1="&#x402;" u2="&#x2bc;" k="54" />
+<hkern u1="&#x402;" u2="&#x178;" k="45" />
+<hkern u1="&#x402;" u2="&#x177;" k="26" />
+<hkern u1="&#x402;" u2="&#x176;" k="45" />
+<hkern u1="&#x402;" u2="&#x164;" k="46" />
+<hkern u1="&#x402;" u2="&#x162;" k="46" />
+<hkern u1="&#x402;" u2="&#xff;" k="26" />
+<hkern u1="&#x402;" u2="&#xfd;" k="26" />
+<hkern u1="&#x402;" u2="&#xdd;" k="45" />
+<hkern u1="&#x402;" u2="y" k="26" />
+<hkern u1="&#x402;" u2="x" k="17" />
+<hkern u1="&#x402;" u2="v" k="26" />
+<hkern u1="&#x402;" u2="Y" k="45" />
+<hkern u1="&#x402;" u2="X" k="12" />
+<hkern u1="&#x402;" u2="V" k="44" />
+<hkern u1="&#x402;" u2="T" k="46" />
+<hkern u1="&#x402;" u2="&#x27;" k="54" />
+<hkern u1="&#x402;" u2="&#x22;" k="54" />
+<hkern u1="&#x403;" u2="&#x510;" k="43" />
+<hkern u1="&#x403;" u2="&#x50f;" k="208" />
+<hkern u1="&#x403;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x403;" u2="&#x50b;" k="246" />
+<hkern u1="&#x403;" u2="&#x507;" k="161" />
+<hkern u1="&#x403;" u2="&#x505;" k="207" />
+<hkern u1="&#x403;" u2="&#x500;" k="273" />
+<hkern u1="&#x403;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x403;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x403;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x403;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x403;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x403;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x403;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x403;" u2="&#x49d;" k="242" />
+<hkern u1="&#x403;" u2="&#x491;" k="196" />
+<hkern u1="&#x403;" u2="&#x48f;" k="235" />
+<hkern u1="&#x403;" u2="&#x47f;" k="84" />
+<hkern u1="&#x403;" u2="&#x47b;" k="279" />
+<hkern u1="&#x403;" u2="&#x461;" k="239" />
+<hkern u1="&#x403;" u2="&#x45f;" k="242" />
+<hkern u1="&#x403;" u2="&#x44f;" k="249" />
+<hkern u1="&#x403;" u2="&#x44d;" k="237" />
+<hkern u1="&#x403;" u2="&#x44b;" k="242" />
+<hkern u1="&#x403;" u2="&#x442;" k="152" />
+<hkern u1="&#x403;" u2="&#x437;" k="237" />
+<hkern u1="&#x403;" u2="&#x434;" k="258" />
+<hkern u1="&#x403;" u2="&#x432;" k="183" />
+<hkern u1="&#x403;" u2="&#x431;" k="67" />
+<hkern u1="&#x403;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x403;" u2="&#x414;" k="157" />
+<hkern u1="&#x403;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x403;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x403;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x403;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x403;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x403;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x403;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x403;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x403;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x403;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x403;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x403;" u2="&#xf8;" k="181" />
+<hkern u1="&#x403;" u2="&#xe6;" k="163" />
+<hkern u1="&#x403;" u2="&#xc6;" k="340" />
+<hkern u1="&#x403;" u2="&#xbb;" k="270" />
+<hkern u1="&#x403;" u2="&#xab;" k="277" />
+<hkern u1="&#x403;" u2="w" k="99" />
+<hkern u1="&#x403;" u2="r" k="130" />
+<hkern u1="&#x406;" u2="&#x50e;" k="28" />
+<hkern u1="&#x406;" u2="&#x506;" k="30" />
+<hkern u1="&#x406;" u2="&#x504;" k="29" />
+<hkern u1="&#x406;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x406;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x406;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x406;" u2="&#x434;" k="-21" />
+<hkern u1="&#x406;" u2="&#x414;" k="-21" />
+<hkern u1="&#x407;" u2="&#x50e;" k="28" />
+<hkern u1="&#x407;" u2="&#x506;" k="30" />
+<hkern u1="&#x407;" u2="&#x504;" k="29" />
+<hkern u1="&#x407;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x407;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x407;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x407;" u2="&#x434;" k="-21" />
+<hkern u1="&#x407;" u2="&#x414;" k="-21" />
+<hkern u1="&#x409;" u2="&#x50f;" k="47" />
+<hkern u1="&#x409;" u2="&#x50e;" k="96" />
+<hkern u1="&#x409;" u2="&#x506;" k="20" />
+<hkern u1="&#x409;" u2="&#x504;" k="47" />
+<hkern u1="&#x409;" u2="&#x4bc;" k="33" />
+<hkern u1="&#x409;" u2="&#x4b8;" k="25" />
+<hkern u1="&#x409;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x409;" u2="&#x442;" k="49" />
+<hkern u1="&#x409;" u2="&#x42c;" k="61" />
+<hkern u1="&#x40a;" u2="&#x50f;" k="47" />
+<hkern u1="&#x40a;" u2="&#x50e;" k="96" />
+<hkern u1="&#x40a;" u2="&#x506;" k="20" />
+<hkern u1="&#x40a;" u2="&#x504;" k="47" />
+<hkern u1="&#x40a;" u2="&#x4bc;" k="33" />
+<hkern u1="&#x40a;" u2="&#x4b8;" k="25" />
+<hkern u1="&#x40a;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x40a;" u2="&#x442;" k="49" />
+<hkern u1="&#x40a;" u2="&#x42c;" k="61" />
+<hkern u1="&#x40b;" u2="&#x1ef9;" k="17" />
+<hkern u1="&#x40b;" u2="&#x1ef7;" k="17" />
+<hkern u1="&#x40b;" u2="&#x1ef5;" k="17" />
+<hkern u1="&#x40b;" u2="&#x1ef3;" k="17" />
+<hkern u1="&#x40b;" u2="&#x50f;" k="32" />
+<hkern u1="&#x40b;" u2="&#x505;" k="11" />
+<hkern u1="&#x40b;" u2="&#x4f3;" k="17" />
+<hkern u1="&#x40b;" u2="&#x4f1;" k="17" />
+<hkern u1="&#x40b;" u2="&#x4ef;" k="17" />
+<hkern u1="&#x40b;" u2="&#x4bc;" k="23" />
+<hkern u1="&#x40b;" u2="&#x4b4;" k="66" />
+<hkern u1="&#x40b;" u2="&#x4af;" k="17" />
+<hkern u1="&#x40b;" u2="&#x4ac;" k="66" />
+<hkern u1="&#x40b;" u2="&#x4a1;" k="33" />
+<hkern u1="&#x40b;" u2="&#x4a0;" k="66" />
+<hkern u1="&#x40b;" u2="&#x47f;" k="21" />
+<hkern u1="&#x40b;" u2="&#x477;" k="17" />
+<hkern u1="&#x40b;" u2="&#x475;" k="17" />
+<hkern u1="&#x40b;" u2="&#x461;" k="19" />
+<hkern u1="&#x40b;" u2="&#x45e;" k="17" />
+<hkern u1="&#x40b;" u2="&#x443;" k="17" />
+<hkern u1="&#x40b;" u2="&#x442;" k="33" />
+<hkern u1="&#x40b;" u2="&#x42c;" k="55" />
+<hkern u1="&#x40b;" u2="&#x422;" k="66" />
+<hkern u1="&#x40b;" u2="&#x40b;" k="66" />
+<hkern u1="&#x40b;" u2="&#x402;" k="66" />
+<hkern u1="&#x40b;" u2="&#x3bd;" k="17" />
+<hkern u1="&#x40b;" u2="&#x3b3;" k="17" />
+<hkern u1="&#x40b;" u2="&#x177;" k="17" />
+<hkern u1="&#x40b;" u2="&#x164;" k="66" />
+<hkern u1="&#x40b;" u2="&#x162;" k="66" />
+<hkern u1="&#x40b;" u2="&#xff;" k="17" />
+<hkern u1="&#x40b;" u2="&#xfd;" k="17" />
+<hkern u1="&#x40b;" u2="y" k="17" />
+<hkern u1="&#x40b;" u2="v" k="17" />
+<hkern u1="&#x40b;" u2="T" k="66" />
+<hkern u1="&#x40c;" g2="Q.smcp" k="25" />
+<hkern u1="&#x40c;" u2="&#x510;" k="17" />
+<hkern u1="&#x40c;" u2="&#x50f;" k="53" />
+<hkern u1="&#x40c;" u2="&#x507;" k="52" />
+<hkern u1="&#x40c;" u2="&#x505;" k="52" />
+<hkern u1="&#x40c;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x40c;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x40c;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x40c;" u2="&#x47f;" k="56" />
+<hkern u1="&#x40c;" u2="&#x47b;" k="46" />
+<hkern u1="&#x40c;" u2="&#x461;" k="78" />
+<hkern u1="&#x40c;" u2="&#x442;" k="71" />
+<hkern u1="&#x40c;" u2="&#x431;" k="41" />
+<hkern u1="&#x40c;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x40c;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x40c;" u2="w" k="63" />
+<hkern u1="&#x40e;" u2="&#x50e;" k="-17" />
+<hkern u1="&#x40e;" u2="&#x50b;" k="33" />
+<hkern u1="&#x40e;" u2="&#x500;" k="67" />
+<hkern u1="&#x40e;" u2="&#x4bd;" k="38" />
+<hkern u1="&#x40e;" u2="&#x4bb;" k="34" />
+<hkern u1="&#x40e;" u2="&#x4b9;" k="23" />
+<hkern u1="&#x40e;" u2="&#x4a7;" k="32" />
+<hkern u1="&#x40e;" u2="&#x49d;" k="32" />
+<hkern u1="&#x40e;" u2="&#x491;" k="30" />
+<hkern u1="&#x40e;" u2="&#x48f;" k="35" />
+<hkern u1="&#x40e;" u2="&#x47b;" k="50" />
+<hkern u1="&#x40e;" u2="&#x45f;" k="32" />
+<hkern u1="&#x40e;" u2="&#x44f;" k="46" />
+<hkern u1="&#x40e;" u2="&#x44b;" k="33" />
+<hkern u1="&#x40e;" u2="&#x437;" k="42" />
+<hkern u1="&#x40e;" u2="&#x434;" k="83" />
+<hkern u1="&#x40e;" u2="&#x432;" k="32" />
+<hkern u1="&#x40e;" u2="&#x42c;" k="-18" />
+<hkern u1="&#x40e;" u2="&#x414;" k="82" />
+<hkern u1="&#x40f;" u2="&#x50e;" k="28" />
+<hkern u1="&#x40f;" u2="&#x506;" k="30" />
+<hkern u1="&#x40f;" u2="&#x504;" k="29" />
+<hkern u1="&#x40f;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x40f;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x40f;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x40f;" u2="&#x434;" k="-21" />
+<hkern u1="&#x40f;" u2="&#x414;" k="-21" />
+<hkern u1="&#x410;" g2="T.smcp" k="57" />
+<hkern u1="&#x410;" g2="U.smcp" k="15" />
+<hkern u1="&#x410;" g2="V.smcp" k="51" />
+<hkern u1="&#x410;" g2="W.smcp" k="35" />
+<hkern u1="&#x410;" g2="Y.smcp" k="60" />
+<hkern u1="&#x410;" u2="&#x50f;" k="57" />
+<hkern u1="&#x410;" u2="&#x50e;" k="88" />
+<hkern u1="&#x410;" u2="&#x506;" k="54" />
+<hkern u1="&#x410;" u2="&#x504;" k="80" />
+<hkern u1="&#x410;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x410;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x410;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x410;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x410;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x410;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x410;" u2="&#x442;" k="54" />
+<hkern u1="&#x410;" u2="&#x42c;" k="59" />
+<hkern u1="&#x410;" u2="&#x414;" k="-19" />
+<hkern u1="&#x410;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x410;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x410;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x410;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x410;" u2="&#x1af;" k="18" />
+<hkern u1="&#x410;" u2="w" k="33" />
+<hkern u1="&#x410;" u2="t" k="17" />
+<hkern u1="&#x410;" u2="&#x3f;" k="80" />
+<hkern u1="&#x411;" u2="&#x1ef8;" k="25" />
+<hkern u1="&#x411;" u2="&#x1ef6;" k="25" />
+<hkern u1="&#x411;" u2="&#x1ef4;" k="25" />
+<hkern u1="&#x411;" u2="&#x1ef2;" k="25" />
+<hkern u1="&#x411;" u2="&#x50f;" k="48" />
+<hkern u1="&#x411;" u2="&#x50e;" k="26" />
+<hkern u1="&#x411;" u2="&#x506;" k="19" />
+<hkern u1="&#x411;" u2="&#x504;" k="25" />
+<hkern u1="&#x411;" u2="&#x4fd;" k="15" />
+<hkern u1="&#x411;" u2="&#x4fc;" k="14" />
+<hkern u1="&#x411;" u2="&#x4f4;" k="24" />
+<hkern u1="&#x411;" u2="&#x4f2;" k="18" />
+<hkern u1="&#x411;" u2="&#x4f0;" k="18" />
+<hkern u1="&#x411;" u2="&#x4ee;" k="18" />
+<hkern u1="&#x411;" u2="&#x4dd;" k="15" />
+<hkern u1="&#x411;" u2="&#x4dc;" k="14" />
+<hkern u1="&#x411;" u2="&#x4cb;" k="24" />
+<hkern u1="&#x411;" u2="&#x4c2;" k="15" />
+<hkern u1="&#x411;" u2="&#x4c1;" k="14" />
+<hkern u1="&#x411;" u2="&#x4b8;" k="24" />
+<hkern u1="&#x411;" u2="&#x4b6;" k="24" />
+<hkern u1="&#x411;" u2="&#x4b4;" k="26" />
+<hkern u1="&#x411;" u2="&#x4b3;" k="15" />
+<hkern u1="&#x411;" u2="&#x4b2;" k="14" />
+<hkern u1="&#x411;" u2="&#x4b0;" k="25" />
+<hkern u1="&#x411;" u2="&#x4ae;" k="25" />
+<hkern u1="&#x411;" u2="&#x4ac;" k="26" />
+<hkern u1="&#x411;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x411;" u2="&#x4a0;" k="26" />
+<hkern u1="&#x411;" u2="&#x497;" k="15" />
+<hkern u1="&#x411;" u2="&#x496;" k="14" />
+<hkern u1="&#x411;" u2="&#x476;" k="25" />
+<hkern u1="&#x411;" u2="&#x474;" k="25" />
+<hkern u1="&#x411;" u2="&#x445;" k="15" />
+<hkern u1="&#x411;" u2="&#x442;" k="48" />
+<hkern u1="&#x411;" u2="&#x436;" k="15" />
+<hkern u1="&#x411;" u2="&#x42c;" k="26" />
+<hkern u1="&#x411;" u2="&#x427;" k="24" />
+<hkern u1="&#x411;" u2="&#x425;" k="14" />
+<hkern u1="&#x411;" u2="&#x423;" k="18" />
+<hkern u1="&#x411;" u2="&#x422;" k="26" />
+<hkern u1="&#x411;" u2="&#x416;" k="14" />
+<hkern u1="&#x411;" u2="&#x40e;" k="18" />
+<hkern u1="&#x411;" u2="&#x40b;" k="26" />
+<hkern u1="&#x411;" u2="&#x402;" k="26" />
+<hkern u1="&#x411;" u2="&#x3ab;" k="25" />
+<hkern u1="&#x411;" u2="&#x3a7;" k="14" />
+<hkern u1="&#x411;" u2="&#x3a5;" k="25" />
+<hkern u1="&#x411;" u2="&#x38e;" k="25" />
+<hkern u1="&#x411;" u2="&#x178;" k="25" />
+<hkern u1="&#x411;" u2="&#x176;" k="25" />
+<hkern u1="&#x411;" u2="&#x164;" k="26" />
+<hkern u1="&#x411;" u2="&#x162;" k="26" />
+<hkern u1="&#x411;" u2="&#xdd;" k="25" />
+<hkern u1="&#x411;" u2="x" k="15" />
+<hkern u1="&#x411;" u2="Y" k="25" />
+<hkern u1="&#x411;" u2="X" k="14" />
+<hkern u1="&#x411;" u2="V" k="25" />
+<hkern u1="&#x411;" u2="T" k="26" />
+<hkern u1="&#x412;" u2="&#x50e;" k="26" />
+<hkern u1="&#x412;" u2="&#x46a;" k="-11" />
+<hkern u1="&#x413;" u2="&#x510;" k="43" />
+<hkern u1="&#x413;" u2="&#x50f;" k="208" />
+<hkern u1="&#x413;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x413;" u2="&#x50b;" k="246" />
+<hkern u1="&#x413;" u2="&#x507;" k="161" />
+<hkern u1="&#x413;" u2="&#x505;" k="207" />
+<hkern u1="&#x413;" u2="&#x500;" k="273" />
+<hkern u1="&#x413;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x413;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x413;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x413;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x413;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x413;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x413;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x413;" u2="&#x49d;" k="242" />
+<hkern u1="&#x413;" u2="&#x491;" k="196" />
+<hkern u1="&#x413;" u2="&#x48f;" k="235" />
+<hkern u1="&#x413;" u2="&#x47f;" k="84" />
+<hkern u1="&#x413;" u2="&#x47b;" k="279" />
+<hkern u1="&#x413;" u2="&#x461;" k="239" />
+<hkern u1="&#x413;" u2="&#x45f;" k="242" />
+<hkern u1="&#x413;" u2="&#x44f;" k="249" />
+<hkern u1="&#x413;" u2="&#x44d;" k="237" />
+<hkern u1="&#x413;" u2="&#x44b;" k="242" />
+<hkern u1="&#x413;" u2="&#x442;" k="152" />
+<hkern u1="&#x413;" u2="&#x437;" k="237" />
+<hkern u1="&#x413;" u2="&#x434;" k="258" />
+<hkern u1="&#x413;" u2="&#x432;" k="183" />
+<hkern u1="&#x413;" u2="&#x431;" k="67" />
+<hkern u1="&#x413;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x413;" u2="&#x414;" k="157" />
+<hkern u1="&#x413;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x413;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x413;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x413;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x413;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x413;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x413;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x413;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x413;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x413;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x413;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x413;" u2="&#xf8;" k="181" />
+<hkern u1="&#x413;" u2="&#xe6;" k="163" />
+<hkern u1="&#x413;" u2="&#xc6;" k="340" />
+<hkern u1="&#x413;" u2="&#xbb;" k="270" />
+<hkern u1="&#x413;" u2="&#xab;" k="277" />
+<hkern u1="&#x413;" u2="w" k="99" />
+<hkern u1="&#x413;" u2="r" k="130" />
+<hkern u1="&#x414;" u2="&#x1f4d;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ef8;" k="33" />
+<hkern u1="&#x414;" u2="&#x1ef6;" k="33" />
+<hkern u1="&#x414;" u2="&#x1ef4;" k="33" />
+<hkern u1="&#x414;" u2="&#x1ef2;" k="33" />
+<hkern u1="&#x414;" u2="&#x1ee2;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ee0;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ede;" k="24" />
+<hkern u1="&#x414;" u2="&#x1edc;" k="24" />
+<hkern u1="&#x414;" u2="&#x1eda;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ed8;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ed6;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ed4;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ed2;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ed0;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ece;" k="24" />
+<hkern u1="&#x414;" u2="&#x1ecc;" k="24" />
+<hkern u1="&#x414;" u2="&#x1eb6;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eb4;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eb2;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eb0;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eae;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eac;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1eaa;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1ea8;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1ea6;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1ea4;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1ea2;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1ea0;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1e00;" k="-16" />
+<hkern u1="&#x414;" u2="&#x513;" k="-16" />
+<hkern u1="&#x414;" u2="&#x512;" k="-16" />
+<hkern u1="&#x414;" u2="&#x510;" k="14" />
+<hkern u1="&#x414;" u2="&#x50e;" k="33" />
+<hkern u1="&#x414;" u2="&#x50c;" k="24" />
+<hkern u1="&#x414;" u2="&#x508;" k="-16" />
+<hkern u1="&#x414;" u2="&#x506;" k="34" />
+<hkern u1="&#x414;" u2="&#x504;" k="33" />
+<hkern u1="&#x414;" u2="&#x4f5;" k="32" />
+<hkern u1="&#x414;" u2="&#x4f4;" k="31" />
+<hkern u1="&#x414;" u2="&#x4ea;" k="24" />
+<hkern u1="&#x414;" u2="&#x4e8;" k="24" />
+<hkern u1="&#x414;" u2="&#x4e6;" k="24" />
+<hkern u1="&#x414;" u2="&#x4d8;" k="23" />
+<hkern u1="&#x414;" u2="&#x4d2;" k="-16" />
+<hkern u1="&#x414;" u2="&#x4d0;" k="-16" />
+<hkern u1="&#x414;" u2="&#x4cc;" k="32" />
+<hkern u1="&#x414;" u2="&#x4cb;" k="31" />
+<hkern u1="&#x414;" u2="&#x4c6;" k="-16" />
+<hkern u1="&#x414;" u2="&#x4c5;" k="-16" />
+<hkern u1="&#x414;" u2="&#x4bd;" k="31" />
+<hkern u1="&#x414;" u2="&#x4b9;" k="32" />
+<hkern u1="&#x414;" u2="&#x4b8;" k="31" />
+<hkern u1="&#x414;" u2="&#x4b7;" k="32" />
+<hkern u1="&#x414;" u2="&#x4b6;" k="31" />
+<hkern u1="&#x414;" u2="&#x4b4;" k="32" />
+<hkern u1="&#x414;" u2="&#x4b0;" k="33" />
+<hkern u1="&#x414;" u2="&#x4ae;" k="33" />
+<hkern u1="&#x414;" u2="&#x4ac;" k="32" />
+<hkern u1="&#x414;" u2="&#x4aa;" k="24" />
+<hkern u1="&#x414;" u2="&#x4a8;" k="24" />
+<hkern u1="&#x414;" u2="&#x4a0;" k="32" />
+<hkern u1="&#x414;" u2="&#x480;" k="24" />
+<hkern u1="&#x414;" u2="&#x47e;" k="24" />
+<hkern u1="&#x414;" u2="&#x47c;" k="24" />
+<hkern u1="&#x414;" u2="&#x47a;" k="24" />
+<hkern u1="&#x414;" u2="&#x478;" k="24" />
+<hkern u1="&#x414;" u2="&#x476;" k="32" />
+<hkern u1="&#x414;" u2="&#x474;" k="32" />
+<hkern u1="&#x414;" u2="&#x472;" k="24" />
+<hkern u1="&#x414;" u2="&#x466;" k="-16" />
+<hkern u1="&#x414;" u2="&#x460;" k="24" />
+<hkern u1="&#x414;" u2="&#x459;" k="-16" />
+<hkern u1="&#x414;" u2="&#x447;" k="32" />
+<hkern u1="&#x414;" u2="&#x43b;" k="-16" />
+<hkern u1="&#x414;" u2="&#x434;" k="-19" />
+<hkern u1="&#x414;" u2="&#x42c;" k="32" />
+<hkern u1="&#x414;" u2="&#x427;" k="31" />
+<hkern u1="&#x414;" u2="&#x422;" k="32" />
+<hkern u1="&#x414;" u2="&#x421;" k="24" />
+<hkern u1="&#x414;" u2="&#x41e;" k="24" />
+<hkern u1="&#x414;" u2="&#x41b;" k="-16" />
+<hkern u1="&#x414;" u2="&#x414;" k="-20" />
+<hkern u1="&#x414;" u2="&#x410;" k="-16" />
+<hkern u1="&#x414;" u2="&#x40b;" k="32" />
+<hkern u1="&#x414;" u2="&#x409;" k="-16" />
+<hkern u1="&#x414;" u2="&#x404;" k="24" />
+<hkern u1="&#x414;" u2="&#x402;" k="32" />
+<hkern u1="&#x414;" u2="&#x3ab;" k="33" />
+<hkern u1="&#x414;" u2="&#x3a5;" k="33" />
+<hkern u1="&#x414;" u2="&#x39f;" k="24" />
+<hkern u1="&#x414;" u2="&#x39b;" k="-16" />
+<hkern u1="&#x414;" u2="&#x398;" k="24" />
+<hkern u1="&#x414;" u2="&#x394;" k="-16" />
+<hkern u1="&#x414;" u2="&#x391;" k="-16" />
+<hkern u1="&#x414;" u2="&#x38e;" k="33" />
+<hkern u1="&#x414;" u2="&#x38c;" k="24" />
+<hkern u1="&#x414;" u2="&#x386;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1fe;" k="24" />
+<hkern u1="&#x414;" u2="&#x1fa;" k="-16" />
+<hkern u1="&#x414;" u2="&#x1a0;" k="24" />
+<hkern u1="&#x414;" u2="&#x178;" k="33" />
+<hkern u1="&#x414;" u2="&#x176;" k="33" />
+<hkern u1="&#x414;" u2="&#x164;" k="32" />
+<hkern u1="&#x414;" u2="&#x162;" k="32" />
+<hkern u1="&#x414;" u2="&#x152;" k="24" />
+<hkern u1="&#x414;" u2="&#x150;" k="24" />
+<hkern u1="&#x414;" u2="&#x14e;" k="24" />
+<hkern u1="&#x414;" u2="&#x14c;" k="24" />
+<hkern u1="&#x414;" u2="&#x122;" k="24" />
+<hkern u1="&#x414;" u2="&#x120;" k="24" />
+<hkern u1="&#x414;" u2="&#x11e;" k="24" />
+<hkern u1="&#x414;" u2="&#x11c;" k="24" />
+<hkern u1="&#x414;" u2="&#x10c;" k="24" />
+<hkern u1="&#x414;" u2="&#x10a;" k="24" />
+<hkern u1="&#x414;" u2="&#x108;" k="24" />
+<hkern u1="&#x414;" u2="&#x106;" k="24" />
+<hkern u1="&#x414;" u2="&#x104;" k="-16" />
+<hkern u1="&#x414;" u2="&#x102;" k="-16" />
+<hkern u1="&#x414;" u2="&#x100;" k="-16" />
+<hkern u1="&#x414;" u2="&#xdd;" k="33" />
+<hkern u1="&#x414;" u2="&#xd8;" k="24" />
+<hkern u1="&#x414;" u2="&#xd6;" k="24" />
+<hkern u1="&#x414;" u2="&#xd5;" k="24" />
+<hkern u1="&#x414;" u2="&#xd4;" k="24" />
+<hkern u1="&#x414;" u2="&#xd3;" k="24" />
+<hkern u1="&#x414;" u2="&#xd2;" k="24" />
+<hkern u1="&#x414;" u2="&#xc7;" k="24" />
+<hkern u1="&#x414;" u2="&#xc5;" k="-16" />
+<hkern u1="&#x414;" u2="&#xc4;" k="-16" />
+<hkern u1="&#x414;" u2="&#xc3;" k="-16" />
+<hkern u1="&#x414;" u2="&#xc2;" k="-16" />
+<hkern u1="&#x414;" u2="&#xc1;" k="-16" />
+<hkern u1="&#x414;" u2="&#xc0;" k="-16" />
+<hkern u1="&#x414;" u2="Y" k="33" />
+<hkern u1="&#x414;" u2="V" k="32" />
+<hkern u1="&#x414;" u2="T" k="32" />
+<hkern u1="&#x414;" u2="Q" k="24" />
+<hkern u1="&#x414;" u2="O" k="24" />
+<hkern u1="&#x414;" u2="G" k="24" />
+<hkern u1="&#x414;" u2="C" k="24" />
+<hkern u1="&#x414;" u2="A" k="-16" />
+<hkern u1="&#x415;" g2="V.smcp" k="16" />
+<hkern u1="&#x415;" g2="W.smcp" k="19" />
+<hkern u1="&#x415;" g2="Y.smcp" k="16" />
+<hkern u1="&#x415;" u2="w" k="22" />
+<hkern u1="&#x415;" u2="f" k="18" />
+<hkern u1="&#x416;" g2="Q.smcp" k="23" />
+<hkern u1="&#x416;" u2="&#x510;" k="14" />
+<hkern u1="&#x416;" u2="&#x50f;" k="42" />
+<hkern u1="&#x416;" u2="&#x506;" k="-12" />
+<hkern u1="&#x416;" u2="&#x504;" k="-13" />
+<hkern u1="&#x416;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x416;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x416;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x416;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x416;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x416;" u2="&#x442;" k="41" />
+<hkern u1="&#x416;" u2="&#x431;" k="23" />
+<hkern u1="&#x416;" u2="&#x414;" k="-18" />
+<hkern u1="&#x416;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x416;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x416;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x416;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x416;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x416;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x416;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x416;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x417;" u2="&#x1ef8;" k="16" />
+<hkern u1="&#x417;" u2="&#x1ef6;" k="16" />
+<hkern u1="&#x417;" u2="&#x1ef4;" k="16" />
+<hkern u1="&#x417;" u2="&#x1ef2;" k="16" />
+<hkern u1="&#x417;" u2="&#x512;" k="11" />
+<hkern u1="&#x417;" u2="&#x50e;" k="14" />
+<hkern u1="&#x417;" u2="&#x508;" k="11" />
+<hkern u1="&#x417;" u2="&#x506;" k="14" />
+<hkern u1="&#x417;" u2="&#x504;" k="14" />
+<hkern u1="&#x417;" u2="&#x4fc;" k="12" />
+<hkern u1="&#x417;" u2="&#x4f2;" k="13" />
+<hkern u1="&#x417;" u2="&#x4f0;" k="13" />
+<hkern u1="&#x417;" u2="&#x4ee;" k="13" />
+<hkern u1="&#x417;" u2="&#x4dc;" k="12" />
+<hkern u1="&#x417;" u2="&#x4c5;" k="11" />
+<hkern u1="&#x417;" u2="&#x4c1;" k="12" />
+<hkern u1="&#x417;" u2="&#x4b4;" k="15" />
+<hkern u1="&#x417;" u2="&#x4b2;" k="12" />
+<hkern u1="&#x417;" u2="&#x4b0;" k="16" />
+<hkern u1="&#x417;" u2="&#x4ae;" k="16" />
+<hkern u1="&#x417;" u2="&#x4ac;" k="15" />
+<hkern u1="&#x417;" u2="&#x4a0;" k="15" />
+<hkern u1="&#x417;" u2="&#x496;" k="12" />
+<hkern u1="&#x417;" u2="&#x476;" k="12" />
+<hkern u1="&#x417;" u2="&#x474;" k="12" />
+<hkern u1="&#x417;" u2="&#x42c;" k="15" />
+<hkern u1="&#x417;" u2="&#x425;" k="12" />
+<hkern u1="&#x417;" u2="&#x423;" k="13" />
+<hkern u1="&#x417;" u2="&#x422;" k="15" />
+<hkern u1="&#x417;" u2="&#x41b;" k="11" />
+<hkern u1="&#x417;" u2="&#x416;" k="12" />
+<hkern u1="&#x417;" u2="&#x40e;" k="13" />
+<hkern u1="&#x417;" u2="&#x40b;" k="15" />
+<hkern u1="&#x417;" u2="&#x409;" k="11" />
+<hkern u1="&#x417;" u2="&#x402;" k="15" />
+<hkern u1="&#x417;" u2="&#x3ab;" k="16" />
+<hkern u1="&#x417;" u2="&#x3a7;" k="12" />
+<hkern u1="&#x417;" u2="&#x3a5;" k="16" />
+<hkern u1="&#x417;" u2="&#x38e;" k="16" />
+<hkern u1="&#x417;" u2="&#x178;" k="16" />
+<hkern u1="&#x417;" u2="&#x176;" k="16" />
+<hkern u1="&#x417;" u2="&#x164;" k="15" />
+<hkern u1="&#x417;" u2="&#x162;" k="15" />
+<hkern u1="&#x417;" u2="&#xdd;" k="16" />
+<hkern u1="&#x417;" u2="Y" k="16" />
+<hkern u1="&#x417;" u2="X" k="12" />
+<hkern u1="&#x417;" u2="V" k="12" />
+<hkern u1="&#x417;" u2="T" k="15" />
+<hkern u1="&#x417;" u2="&#x37;" k="14" />
+<hkern u1="&#x418;" u2="&#x50e;" k="28" />
+<hkern u1="&#x418;" u2="&#x506;" k="30" />
+<hkern u1="&#x418;" u2="&#x504;" k="29" />
+<hkern u1="&#x418;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x418;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x418;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x418;" u2="&#x434;" k="-21" />
+<hkern u1="&#x418;" u2="&#x414;" k="-21" />
+<hkern u1="&#x41a;" g2="Q.smcp" k="25" />
+<hkern u1="&#x41a;" u2="&#x510;" k="17" />
+<hkern u1="&#x41a;" u2="&#x50f;" k="53" />
+<hkern u1="&#x41a;" u2="&#x507;" k="52" />
+<hkern u1="&#x41a;" u2="&#x505;" k="52" />
+<hkern u1="&#x41a;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x41a;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x41a;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x41a;" u2="&#x47f;" k="56" />
+<hkern u1="&#x41a;" u2="&#x47b;" k="46" />
+<hkern u1="&#x41a;" u2="&#x461;" k="78" />
+<hkern u1="&#x41a;" u2="&#x442;" k="71" />
+<hkern u1="&#x41a;" u2="&#x431;" k="41" />
+<hkern u1="&#x41a;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x41a;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x41a;" u2="w" k="63" />
+<hkern u1="&#x41b;" u2="&#x50e;" k="28" />
+<hkern u1="&#x41b;" u2="&#x506;" k="30" />
+<hkern u1="&#x41b;" u2="&#x504;" k="29" />
+<hkern u1="&#x41b;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x41b;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x41b;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x41b;" u2="&#x434;" k="-21" />
+<hkern u1="&#x41b;" u2="&#x414;" k="-21" />
+<hkern u1="&#x41c;" u2="&#x50e;" k="28" />
+<hkern u1="&#x41c;" u2="&#x506;" k="30" />
+<hkern u1="&#x41c;" u2="&#x504;" k="29" />
+<hkern u1="&#x41c;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x41c;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x41c;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x41c;" u2="&#x434;" k="-21" />
+<hkern u1="&#x41c;" u2="&#x414;" k="-21" />
+<hkern u1="&#x41d;" u2="&#x50e;" k="28" />
+<hkern u1="&#x41d;" u2="&#x506;" k="30" />
+<hkern u1="&#x41d;" u2="&#x504;" k="29" />
+<hkern u1="&#x41d;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x41d;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x41d;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x41d;" u2="&#x434;" k="-21" />
+<hkern u1="&#x41d;" u2="&#x414;" k="-21" />
+<hkern u1="&#x41e;" g2="X.smcp" k="11" />
+<hkern u1="&#x41e;" u2="&#x50e;" k="32" />
+<hkern u1="&#x41e;" u2="&#x42c;" k="32" />
+<hkern u1="&#x41e;" u2="&#x414;" k="33" />
+<hkern u1="&#x41e;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x41e;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x41e;" u2="&#x39e;" k="13" />
+<hkern u1="&#x41e;" u2="&#xc6;" k="33" />
+<hkern u1="&#x420;" u2="&#x500;" k="48" />
+<hkern u1="&#x420;" u2="&#x434;" k="171" />
+<hkern u1="&#x420;" u2="&#x414;" k="235" />
+<hkern u1="&#x420;" u2="&#x3c1;" k="56" />
+<hkern u1="&#x420;" u2="&#x3bb;" k="102" />
+<hkern u1="&#x420;" u2="&#x3b4;" k="40" />
+<hkern u1="&#x420;" u2="&#xc6;" k="293" />
+<hkern u1="&#x420;" u2="t" k="-14" />
+<hkern u1="&#x421;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x421;" u2="&#x7d;" k="17" />
+<hkern u1="&#x421;" u2="]" k="12" />
+<hkern u1="&#x421;" u2="&#x29;" k="26" />
+<hkern u1="&#x422;" g2="Q.smcp" k="71" />
+<hkern u1="&#x422;" g2="S.smcp" k="68" />
+<hkern u1="&#x422;" g2="T.smcp" k="15" />
+<hkern u1="&#x422;" g2="W.smcp" k="15" />
+<hkern u1="&#x422;" g2="X.smcp" k="19" />
+<hkern u1="&#x422;" u2="&#x510;" k="14" />
+<hkern u1="&#x422;" u2="&#x50f;" k="111" />
+<hkern u1="&#x422;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x422;" u2="&#x50b;" k="133" />
+<hkern u1="&#x422;" u2="&#x507;" k="83" />
+<hkern u1="&#x422;" u2="&#x505;" k="110" />
+<hkern u1="&#x422;" u2="&#x500;" k="149" />
+<hkern u1="&#x422;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x422;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x422;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x422;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x422;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x422;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x422;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x422;" u2="&#x49d;" k="131" />
+<hkern u1="&#x422;" u2="&#x491;" k="104" />
+<hkern u1="&#x422;" u2="&#x48f;" k="127" />
+<hkern u1="&#x422;" u2="&#x47f;" k="38" />
+<hkern u1="&#x422;" u2="&#x47b;" k="153" />
+<hkern u1="&#x422;" u2="&#x461;" k="129" />
+<hkern u1="&#x422;" u2="&#x45f;" k="131" />
+<hkern u1="&#x422;" u2="&#x44f;" k="135" />
+<hkern u1="&#x422;" u2="&#x44d;" k="128" />
+<hkern u1="&#x422;" u2="&#x44b;" k="131" />
+<hkern u1="&#x422;" u2="&#x442;" k="78" />
+<hkern u1="&#x422;" u2="&#x437;" k="128" />
+<hkern u1="&#x422;" u2="&#x434;" k="140" />
+<hkern u1="&#x422;" u2="&#x432;" k="96" />
+<hkern u1="&#x422;" u2="&#x431;" k="28" />
+<hkern u1="&#x422;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x422;" u2="&#x414;" k="81" />
+<hkern u1="&#x422;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x422;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x422;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x422;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x422;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x422;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x422;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x422;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x422;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x422;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x422;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x422;" u2="&#xf8;" k="95" />
+<hkern u1="&#x422;" u2="&#xe6;" k="84" />
+<hkern u1="&#x422;" u2="&#xc6;" k="188" />
+<hkern u1="&#x422;" u2="&#xbb;" k="147" />
+<hkern u1="&#x422;" u2="&#xab;" k="151" />
+<hkern u1="&#x422;" u2="w" k="47" />
+<hkern u1="&#x422;" u2="r" k="65" />
+<hkern u1="&#x423;" u2="&#x50e;" k="-17" />
+<hkern u1="&#x423;" u2="&#x50b;" k="33" />
+<hkern u1="&#x423;" u2="&#x500;" k="67" />
+<hkern u1="&#x423;" u2="&#x4bd;" k="38" />
+<hkern u1="&#x423;" u2="&#x4bb;" k="34" />
+<hkern u1="&#x423;" u2="&#x4b9;" k="23" />
+<hkern u1="&#x423;" u2="&#x4a7;" k="32" />
+<hkern u1="&#x423;" u2="&#x49d;" k="32" />
+<hkern u1="&#x423;" u2="&#x491;" k="30" />
+<hkern u1="&#x423;" u2="&#x48f;" k="35" />
+<hkern u1="&#x423;" u2="&#x47b;" k="50" />
+<hkern u1="&#x423;" u2="&#x45f;" k="32" />
+<hkern u1="&#x423;" u2="&#x44f;" k="46" />
+<hkern u1="&#x423;" u2="&#x44b;" k="33" />
+<hkern u1="&#x423;" u2="&#x437;" k="42" />
+<hkern u1="&#x423;" u2="&#x434;" k="83" />
+<hkern u1="&#x423;" u2="&#x432;" k="32" />
+<hkern u1="&#x423;" u2="&#x42c;" k="-18" />
+<hkern u1="&#x423;" u2="&#x414;" k="82" />
+<hkern u1="&#x425;" g2="Q.smcp" k="23" />
+<hkern u1="&#x425;" u2="&#x510;" k="14" />
+<hkern u1="&#x425;" u2="&#x50f;" k="42" />
+<hkern u1="&#x425;" u2="&#x506;" k="-12" />
+<hkern u1="&#x425;" u2="&#x504;" k="-13" />
+<hkern u1="&#x425;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x425;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x425;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x425;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x425;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x425;" u2="&#x442;" k="41" />
+<hkern u1="&#x425;" u2="&#x431;" k="23" />
+<hkern u1="&#x425;" u2="&#x414;" k="-18" />
+<hkern u1="&#x425;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x425;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x425;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x425;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x425;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x425;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x425;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x425;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x426;" u2="&#x50e;" k="28" />
+<hkern u1="&#x426;" u2="&#x506;" k="30" />
+<hkern u1="&#x426;" u2="&#x504;" k="29" />
+<hkern u1="&#x426;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x426;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x426;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x426;" u2="&#x434;" k="-21" />
+<hkern u1="&#x426;" u2="&#x414;" k="-21" />
+<hkern u1="&#x428;" u2="&#x50e;" k="28" />
+<hkern u1="&#x428;" u2="&#x506;" k="30" />
+<hkern u1="&#x428;" u2="&#x504;" k="29" />
+<hkern u1="&#x428;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x428;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x428;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x428;" u2="&#x434;" k="-21" />
+<hkern u1="&#x428;" u2="&#x414;" k="-21" />
+<hkern u1="&#x429;" u2="&#x1ef8;" k="26" />
+<hkern u1="&#x429;" u2="&#x1ef6;" k="26" />
+<hkern u1="&#x429;" u2="&#x1ef4;" k="26" />
+<hkern u1="&#x429;" u2="&#x1ef2;" k="26" />
+<hkern u1="&#x429;" u2="&#x1eb6;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eb4;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eb2;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eb0;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eae;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eac;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1eaa;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1ea8;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1ea6;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1ea4;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1ea2;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1ea0;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1e00;" k="-15" />
+<hkern u1="&#x429;" u2="&#x513;" k="-15" />
+<hkern u1="&#x429;" u2="&#x512;" k="-14" />
+<hkern u1="&#x429;" u2="&#x50f;" k="25" />
+<hkern u1="&#x429;" u2="&#x50e;" k="26" />
+<hkern u1="&#x429;" u2="&#x508;" k="-14" />
+<hkern u1="&#x429;" u2="&#x506;" k="26" />
+<hkern u1="&#x429;" u2="&#x504;" k="26" />
+<hkern u1="&#x429;" u2="&#x4fc;" k="-14" />
+<hkern u1="&#x429;" u2="&#x4f5;" k="24" />
+<hkern u1="&#x429;" u2="&#x4f4;" k="27" />
+<hkern u1="&#x429;" u2="&#x4f2;" k="-11" />
+<hkern u1="&#x429;" u2="&#x4f0;" k="-11" />
+<hkern u1="&#x429;" u2="&#x4ee;" k="-11" />
+<hkern u1="&#x429;" u2="&#x4dc;" k="-14" />
+<hkern u1="&#x429;" u2="&#x4d2;" k="-15" />
+<hkern u1="&#x429;" u2="&#x4d0;" k="-15" />
+<hkern u1="&#x429;" u2="&#x4cc;" k="24" />
+<hkern u1="&#x429;" u2="&#x4cb;" k="27" />
+<hkern u1="&#x429;" u2="&#x4c6;" k="-15" />
+<hkern u1="&#x429;" u2="&#x4c5;" k="-14" />
+<hkern u1="&#x429;" u2="&#x4c1;" k="-14" />
+<hkern u1="&#x429;" u2="&#x4b9;" k="24" />
+<hkern u1="&#x429;" u2="&#x4b8;" k="27" />
+<hkern u1="&#x429;" u2="&#x4b7;" k="24" />
+<hkern u1="&#x429;" u2="&#x4b6;" k="27" />
+<hkern u1="&#x429;" u2="&#x4b4;" k="26" />
+<hkern u1="&#x429;" u2="&#x4b2;" k="-14" />
+<hkern u1="&#x429;" u2="&#x4b0;" k="26" />
+<hkern u1="&#x429;" u2="&#x4ae;" k="26" />
+<hkern u1="&#x429;" u2="&#x4ac;" k="26" />
+<hkern u1="&#x429;" u2="&#x4a1;" k="25" />
+<hkern u1="&#x429;" u2="&#x4a0;" k="26" />
+<hkern u1="&#x429;" u2="&#x496;" k="-14" />
+<hkern u1="&#x429;" u2="&#x476;" k="26" />
+<hkern u1="&#x429;" u2="&#x474;" k="26" />
+<hkern u1="&#x429;" u2="&#x466;" k="-15" />
+<hkern u1="&#x429;" u2="&#x459;" k="-15" />
+<hkern u1="&#x429;" u2="&#x447;" k="24" />
+<hkern u1="&#x429;" u2="&#x442;" k="25" />
+<hkern u1="&#x429;" u2="&#x43b;" k="-15" />
+<hkern u1="&#x429;" u2="&#x434;" k="-18" />
+<hkern u1="&#x429;" u2="&#x42d;" k="12" />
+<hkern u1="&#x429;" u2="&#x42c;" k="26" />
+<hkern u1="&#x429;" u2="&#x427;" k="27" />
+<hkern u1="&#x429;" u2="&#x425;" k="-14" />
+<hkern u1="&#x429;" u2="&#x423;" k="-11" />
+<hkern u1="&#x429;" u2="&#x422;" k="26" />
+<hkern u1="&#x429;" u2="&#x41b;" k="-14" />
+<hkern u1="&#x429;" u2="&#x416;" k="-14" />
+<hkern u1="&#x429;" u2="&#x414;" k="-19" />
+<hkern u1="&#x429;" u2="&#x410;" k="-15" />
+<hkern u1="&#x429;" u2="&#x40e;" k="-11" />
+<hkern u1="&#x429;" u2="&#x40b;" k="26" />
+<hkern u1="&#x429;" u2="&#x409;" k="-14" />
+<hkern u1="&#x429;" u2="&#x402;" k="26" />
+<hkern u1="&#x429;" u2="&#x3ab;" k="26" />
+<hkern u1="&#x429;" u2="&#x3a7;" k="-14" />
+<hkern u1="&#x429;" u2="&#x3a5;" k="26" />
+<hkern u1="&#x429;" u2="&#x39b;" k="-15" />
+<hkern u1="&#x429;" u2="&#x394;" k="-15" />
+<hkern u1="&#x429;" u2="&#x391;" k="-15" />
+<hkern u1="&#x429;" u2="&#x38e;" k="26" />
+<hkern u1="&#x429;" u2="&#x386;" k="-15" />
+<hkern u1="&#x429;" u2="&#x1fa;" k="-15" />
+<hkern u1="&#x429;" u2="&#x178;" k="26" />
+<hkern u1="&#x429;" u2="&#x176;" k="26" />
+<hkern u1="&#x429;" u2="&#x164;" k="26" />
+<hkern u1="&#x429;" u2="&#x162;" k="26" />
+<hkern u1="&#x429;" u2="&#x104;" k="-15" />
+<hkern u1="&#x429;" u2="&#x102;" k="-15" />
+<hkern u1="&#x429;" u2="&#x100;" k="-15" />
+<hkern u1="&#x429;" u2="&#xdd;" k="26" />
+<hkern u1="&#x429;" u2="&#xc5;" k="-15" />
+<hkern u1="&#x429;" u2="&#xc4;" k="-15" />
+<hkern u1="&#x429;" u2="&#xc3;" k="-15" />
+<hkern u1="&#x429;" u2="&#xc2;" k="-15" />
+<hkern u1="&#x429;" u2="&#xc1;" k="-15" />
+<hkern u1="&#x429;" u2="&#xc0;" k="-15" />
+<hkern u1="&#x429;" u2="Y" k="26" />
+<hkern u1="&#x429;" u2="X" k="-14" />
+<hkern u1="&#x429;" u2="V" k="26" />
+<hkern u1="&#x429;" u2="T" k="26" />
+<hkern u1="&#x429;" u2="A" k="-15" />
+<hkern u1="&#x42a;" u2="&#x50f;" k="47" />
+<hkern u1="&#x42a;" u2="&#x50e;" k="96" />
+<hkern u1="&#x42a;" u2="&#x506;" k="20" />
+<hkern u1="&#x42a;" u2="&#x504;" k="47" />
+<hkern u1="&#x42a;" u2="&#x4bc;" k="33" />
+<hkern u1="&#x42a;" u2="&#x4b8;" k="25" />
+<hkern u1="&#x42a;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x42a;" u2="&#x442;" k="49" />
+<hkern u1="&#x42a;" u2="&#x42c;" k="61" />
+<hkern u1="&#x42c;" u2="&#x50f;" k="47" />
+<hkern u1="&#x42c;" u2="&#x50e;" k="96" />
+<hkern u1="&#x42c;" u2="&#x506;" k="20" />
+<hkern u1="&#x42c;" u2="&#x504;" k="47" />
+<hkern u1="&#x42c;" u2="&#x4bc;" k="33" />
+<hkern u1="&#x42c;" u2="&#x4b8;" k="25" />
+<hkern u1="&#x42c;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x42c;" u2="&#x442;" k="49" />
+<hkern u1="&#x42c;" u2="&#x42c;" k="61" />
+<hkern u1="&#x42d;" u2="&#x1ef8;" k="28" />
+<hkern u1="&#x42d;" u2="&#x1ef6;" k="28" />
+<hkern u1="&#x42d;" u2="&#x1ef4;" k="28" />
+<hkern u1="&#x42d;" u2="&#x1ef2;" k="28" />
+<hkern u1="&#x42d;" u2="&#x513;" k="22" />
+<hkern u1="&#x42d;" u2="&#x512;" k="27" />
+<hkern u1="&#x42d;" u2="&#x50e;" k="28" />
+<hkern u1="&#x42d;" u2="&#x508;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4fc;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4f2;" k="23" />
+<hkern u1="&#x42d;" u2="&#x4f0;" k="23" />
+<hkern u1="&#x42d;" u2="&#x4ee;" k="23" />
+<hkern u1="&#x42d;" u2="&#x4dc;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4c6;" k="22" />
+<hkern u1="&#x42d;" u2="&#x4c5;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4c1;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4b4;" k="29" />
+<hkern u1="&#x42d;" u2="&#x4b2;" k="27" />
+<hkern u1="&#x42d;" u2="&#x4b0;" k="28" />
+<hkern u1="&#x42d;" u2="&#x4ae;" k="28" />
+<hkern u1="&#x42d;" u2="&#x4ac;" k="29" />
+<hkern u1="&#x42d;" u2="&#x4a0;" k="29" />
+<hkern u1="&#x42d;" u2="&#x496;" k="27" />
+<hkern u1="&#x42d;" u2="&#x459;" k="22" />
+<hkern u1="&#x42d;" u2="&#x43b;" k="22" />
+<hkern u1="&#x42d;" u2="&#x425;" k="27" />
+<hkern u1="&#x42d;" u2="&#x423;" k="23" />
+<hkern u1="&#x42d;" u2="&#x422;" k="29" />
+<hkern u1="&#x42d;" u2="&#x41b;" k="27" />
+<hkern u1="&#x42d;" u2="&#x416;" k="27" />
+<hkern u1="&#x42d;" u2="&#x414;" k="30" />
+<hkern u1="&#x42d;" u2="&#x40e;" k="23" />
+<hkern u1="&#x42d;" u2="&#x40b;" k="29" />
+<hkern u1="&#x42d;" u2="&#x409;" k="27" />
+<hkern u1="&#x42d;" u2="&#x402;" k="29" />
+<hkern u1="&#x42d;" u2="&#x3ab;" k="28" />
+<hkern u1="&#x42d;" u2="&#x3a7;" k="27" />
+<hkern u1="&#x42d;" u2="&#x3a5;" k="28" />
+<hkern u1="&#x42d;" u2="&#x38e;" k="28" />
+<hkern u1="&#x42d;" u2="&#x178;" k="28" />
+<hkern u1="&#x42d;" u2="&#x176;" k="28" />
+<hkern u1="&#x42d;" u2="&#x164;" k="29" />
+<hkern u1="&#x42d;" u2="&#x162;" k="29" />
+<hkern u1="&#x42d;" u2="&#xdd;" k="28" />
+<hkern u1="&#x42d;" u2="Y" k="28" />
+<hkern u1="&#x42d;" u2="X" k="27" />
+<hkern u1="&#x42d;" u2="T" k="29" />
+<hkern u1="&#x42e;" u2="&#x513;" k="21" />
+<hkern u1="&#x42e;" u2="&#x512;" k="28" />
+<hkern u1="&#x42e;" u2="&#x508;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4fc;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4f2;" k="23" />
+<hkern u1="&#x42e;" u2="&#x4f0;" k="23" />
+<hkern u1="&#x42e;" u2="&#x4ee;" k="23" />
+<hkern u1="&#x42e;" u2="&#x4dc;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4c6;" k="21" />
+<hkern u1="&#x42e;" u2="&#x4c5;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4c1;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4b4;" k="30" />
+<hkern u1="&#x42e;" u2="&#x4b2;" k="28" />
+<hkern u1="&#x42e;" u2="&#x4ac;" k="30" />
+<hkern u1="&#x42e;" u2="&#x4a0;" k="30" />
+<hkern u1="&#x42e;" u2="&#x496;" k="28" />
+<hkern u1="&#x42e;" u2="&#x459;" k="21" />
+<hkern u1="&#x42e;" u2="&#x43b;" k="21" />
+<hkern u1="&#x42e;" u2="&#x434;" k="28" />
+<hkern u1="&#x42e;" u2="&#x425;" k="28" />
+<hkern u1="&#x42e;" u2="&#x423;" k="23" />
+<hkern u1="&#x42e;" u2="&#x422;" k="30" />
+<hkern u1="&#x42e;" u2="&#x41b;" k="28" />
+<hkern u1="&#x42e;" u2="&#x416;" k="28" />
+<hkern u1="&#x42e;" u2="&#x414;" k="31" />
+<hkern u1="&#x42e;" u2="&#x40e;" k="23" />
+<hkern u1="&#x42e;" u2="&#x40b;" k="30" />
+<hkern u1="&#x42e;" u2="&#x409;" k="28" />
+<hkern u1="&#x42e;" u2="&#x402;" k="30" />
+<hkern u1="&#x42e;" u2="&#x3a7;" k="28" />
+<hkern u1="&#x42e;" u2="&#x164;" k="30" />
+<hkern u1="&#x42e;" u2="&#x162;" k="30" />
+<hkern u1="&#x42e;" u2="X" k="28" />
+<hkern u1="&#x42e;" u2="T" k="30" />
+<hkern u1="&#x42f;" u2="&#x1ef8;" k="13" />
+<hkern u1="&#x42f;" u2="&#x1ef6;" k="13" />
+<hkern u1="&#x42f;" u2="&#x1ef4;" k="13" />
+<hkern u1="&#x42f;" u2="&#x1ef2;" k="13" />
+<hkern u1="&#x42f;" u2="&#x4b4;" k="21" />
+<hkern u1="&#x42f;" u2="&#x4b0;" k="13" />
+<hkern u1="&#x42f;" u2="&#x4ae;" k="13" />
+<hkern u1="&#x42f;" u2="&#x4ac;" k="21" />
+<hkern u1="&#x42f;" u2="&#x4a0;" k="21" />
+<hkern u1="&#x42f;" u2="&#x422;" k="21" />
+<hkern u1="&#x42f;" u2="&#x40b;" k="21" />
+<hkern u1="&#x42f;" u2="&#x402;" k="21" />
+<hkern u1="&#x42f;" u2="&#x3ab;" k="13" />
+<hkern u1="&#x42f;" u2="&#x3a5;" k="13" />
+<hkern u1="&#x42f;" u2="&#x38e;" k="13" />
+<hkern u1="&#x42f;" u2="&#x178;" k="13" />
+<hkern u1="&#x42f;" u2="&#x176;" k="13" />
+<hkern u1="&#x42f;" u2="&#x164;" k="21" />
+<hkern u1="&#x42f;" u2="&#x162;" k="21" />
+<hkern u1="&#x42f;" u2="&#xdd;" k="13" />
+<hkern u1="&#x42f;" u2="Y" k="13" />
+<hkern u1="&#x42f;" u2="T" k="21" />
+<hkern u1="&#x430;" u2="&#x50f;" k="15" />
+<hkern u1="&#x430;" u2="&#x507;" k="13" />
+<hkern u1="&#x430;" u2="&#x505;" k="13" />
+<hkern u1="&#x430;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x430;" u2="&#x47f;" k="13" />
+<hkern u1="&#x430;" u2="&#x461;" k="15" />
+<hkern u1="&#x430;" u2="&#x442;" k="16" />
+<hkern u1="&#x431;" u2="&#x1e3f;" k="17" />
+<hkern u1="&#x431;" u2="&#x50f;" k="17" />
+<hkern u1="&#x431;" u2="&#x4fd;" k="16" />
+<hkern u1="&#x431;" u2="&#x4fb;" k="17" />
+<hkern u1="&#x431;" u2="&#x4f9;" k="17" />
+<hkern u1="&#x431;" u2="&#x4f7;" k="17" />
+<hkern u1="&#x431;" u2="&#x4e5;" k="17" />
+<hkern u1="&#x431;" u2="&#x4e3;" k="17" />
+<hkern u1="&#x431;" u2="&#x4dd;" k="16" />
+<hkern u1="&#x431;" u2="&#x4ce;" k="17" />
+<hkern u1="&#x431;" u2="&#x4ca;" k="17" />
+<hkern u1="&#x431;" u2="&#x4c8;" k="17" />
+<hkern u1="&#x431;" u2="&#x4c2;" k="16" />
+<hkern u1="&#x431;" u2="&#x4b3;" k="16" />
+<hkern u1="&#x431;" u2="&#x4a5;" k="17" />
+<hkern u1="&#x431;" u2="&#x4a3;" k="17" />
+<hkern u1="&#x431;" u2="&#x4a1;" k="17" />
+<hkern u1="&#x431;" u2="&#x49b;" k="17" />
+<hkern u1="&#x431;" u2="&#x497;" k="16" />
+<hkern u1="&#x431;" u2="&#x48b;" k="17" />
+<hkern u1="&#x431;" u2="&#x47f;" k="15" />
+<hkern u1="&#x431;" u2="&#x461;" k="12" />
+<hkern u1="&#x431;" u2="&#x45d;" k="17" />
+<hkern u1="&#x431;" u2="&#x45c;" k="17" />
+<hkern u1="&#x431;" u2="&#x45a;" k="17" />
+<hkern u1="&#x431;" u2="&#x453;" k="17" />
+<hkern u1="&#x431;" u2="&#x44e;" k="17" />
+<hkern u1="&#x431;" u2="&#x44c;" k="17" />
+<hkern u1="&#x431;" u2="&#x449;" k="17" />
+<hkern u1="&#x431;" u2="&#x448;" k="17" />
+<hkern u1="&#x431;" u2="&#x446;" k="17" />
+<hkern u1="&#x431;" u2="&#x445;" k="16" />
+<hkern u1="&#x431;" u2="&#x442;" k="18" />
+<hkern u1="&#x431;" u2="&#x440;" k="17" />
+<hkern u1="&#x431;" u2="&#x43f;" k="17" />
+<hkern u1="&#x431;" u2="&#x43d;" k="17" />
+<hkern u1="&#x431;" u2="&#x43c;" k="17" />
+<hkern u1="&#x431;" u2="&#x43a;" k="17" />
+<hkern u1="&#x431;" u2="&#x439;" k="17" />
+<hkern u1="&#x431;" u2="&#x438;" k="17" />
+<hkern u1="&#x431;" u2="&#x436;" k="16" />
+<hkern u1="&#x431;" u2="&#x434;" k="18" />
+<hkern u1="&#x431;" u2="&#x433;" k="17" />
+<hkern u1="&#x431;" u2="&#x3b7;" k="17" />
+<hkern u1="&#x431;" u2="&#x3ae;" k="17" />
+<hkern u1="&#x431;" u2="&#x149;" k="17" />
+<hkern u1="&#x431;" u2="&#x148;" k="17" />
+<hkern u1="&#x431;" u2="&#x146;" k="17" />
+<hkern u1="&#x431;" u2="&#x144;" k="17" />
+<hkern u1="&#x431;" u2="&#xf1;" k="17" />
+<hkern u1="&#x431;" u2="x" k="16" />
+<hkern u1="&#x431;" u2="p" k="17" />
+<hkern u1="&#x431;" u2="n" k="17" />
+<hkern u1="&#x431;" u2="m" k="17" />
+<hkern u1="&#x432;" u2="&#x2033;" k="14" />
+<hkern u1="&#x432;" u2="&#x2032;" k="14" />
+<hkern u1="&#x432;" u2="&#x201d;" k="14" />
+<hkern u1="&#x432;" u2="&#x201c;" k="14" />
+<hkern u1="&#x432;" u2="&#x201b;" k="14" />
+<hkern u1="&#x432;" u2="&#x2019;" k="14" />
+<hkern u1="&#x432;" u2="&#x2018;" k="14" />
+<hkern u1="&#x432;" u2="&#x1ef9;" k="11" />
+<hkern u1="&#x432;" u2="&#x1ef7;" k="11" />
+<hkern u1="&#x432;" u2="&#x1ef5;" k="11" />
+<hkern u1="&#x432;" u2="&#x1ef3;" k="11" />
+<hkern u1="&#x432;" u2="&#x50f;" k="11" />
+<hkern u1="&#x432;" u2="&#x4f3;" k="11" />
+<hkern u1="&#x432;" u2="&#x4f1;" k="11" />
+<hkern u1="&#x432;" u2="&#x4ef;" k="11" />
+<hkern u1="&#x432;" u2="&#x4af;" k="11" />
+<hkern u1="&#x432;" u2="&#x4a1;" k="11" />
+<hkern u1="&#x432;" u2="&#x477;" k="11" />
+<hkern u1="&#x432;" u2="&#x475;" k="11" />
+<hkern u1="&#x432;" u2="&#x461;" k="11" />
+<hkern u1="&#x432;" u2="&#x45e;" k="11" />
+<hkern u1="&#x432;" u2="&#x443;" k="11" />
+<hkern u1="&#x432;" u2="&#x442;" k="12" />
+<hkern u1="&#x432;" u2="&#x3bd;" k="11" />
+<hkern u1="&#x432;" u2="&#x3b3;" k="11" />
+<hkern u1="&#x432;" u2="&#x2bc;" k="14" />
+<hkern u1="&#x432;" u2="&#x177;" k="11" />
+<hkern u1="&#x432;" u2="&#xff;" k="11" />
+<hkern u1="&#x432;" u2="&#xfd;" k="11" />
+<hkern u1="&#x432;" u2="y" k="11" />
+<hkern u1="&#x432;" u2="v" k="11" />
+<hkern u1="&#x432;" u2="&#x27;" k="14" />
+<hkern u1="&#x432;" u2="&#x22;" k="14" />
+<hkern u1="&#x433;" u2="&#x47b;" k="18" />
+<hkern u1="&#x433;" u2="&#x434;" k="55" />
+<hkern u1="&#x434;" u2="&#x50f;" k="19" />
+<hkern u1="&#x434;" u2="&#x4f5;" k="19" />
+<hkern u1="&#x434;" u2="&#x4cc;" k="19" />
+<hkern u1="&#x434;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x434;" u2="&#x4b7;" k="19" />
+<hkern u1="&#x434;" u2="&#x4a1;" k="19" />
+<hkern u1="&#x434;" u2="&#x447;" k="19" />
+<hkern u1="&#x434;" u2="&#x442;" k="19" />
+<hkern u1="&#x434;" u2="&#x434;" k="-20" />
+<hkern u1="&#x435;" u2="&#x442;" k="11" />
+<hkern u1="&#x436;" u2="&#x47b;" k="15" />
+<hkern u1="&#x437;" u2="&#x2033;" k="11" />
+<hkern u1="&#x437;" u2="&#x2032;" k="11" />
+<hkern u1="&#x437;" u2="&#x201d;" k="11" />
+<hkern u1="&#x437;" u2="&#x201c;" k="11" />
+<hkern u1="&#x437;" u2="&#x201b;" k="11" />
+<hkern u1="&#x437;" u2="&#x2019;" k="11" />
+<hkern u1="&#x437;" u2="&#x2018;" k="11" />
+<hkern u1="&#x437;" u2="&#x2bc;" k="11" />
+<hkern u1="&#x437;" u2="&#x27;" k="11" />
+<hkern u1="&#x437;" u2="&#x22;" k="11" />
+<hkern u1="&#x43a;" g2="Q.smcp" k="21" />
+<hkern u1="&#x43a;" u2="&#x1ee3;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ee1;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1edf;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1edd;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1edb;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ed9;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ed7;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ed5;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ed3;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ed1;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ecf;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ecd;" k="56" />
+<hkern u1="&#x43a;" u2="&#x1ec7;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ec5;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ec3;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ec1;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ebf;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ebd;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1ebb;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1eb9;" k="16" />
+<hkern u1="&#x43a;" u2="&#x50d;" k="16" />
+<hkern u1="&#x43a;" u2="&#x503;" k="16" />
+<hkern u1="&#x43a;" u2="&#x502;" k="16" />
+<hkern u1="&#x43a;" u2="&#x501;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4eb;" k="56" />
+<hkern u1="&#x43a;" u2="&#x4e9;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4e7;" k="56" />
+<hkern u1="&#x43a;" u2="&#x4db;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4d9;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4d7;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4ab;" k="16" />
+<hkern u1="&#x43a;" u2="&#x4a9;" k="16" />
+<hkern u1="&#x43a;" u2="&#x481;" k="16" />
+<hkern u1="&#x43a;" u2="&#x47d;" k="16" />
+<hkern u1="&#x43a;" u2="&#x47b;" k="21" />
+<hkern u1="&#x43a;" u2="&#x479;" k="16" />
+<hkern u1="&#x43a;" u2="&#x473;" k="56" />
+<hkern u1="&#x43a;" u2="&#x454;" k="16" />
+<hkern u1="&#x43a;" u2="&#x451;" k="16" />
+<hkern u1="&#x43a;" u2="&#x450;" k="16" />
+<hkern u1="&#x43a;" u2="&#x444;" k="16" />
+<hkern u1="&#x43a;" u2="&#x441;" k="16" />
+<hkern u1="&#x43a;" u2="&#x43e;" k="56" />
+<hkern u1="&#x43a;" u2="&#x435;" k="16" />
+<hkern u1="&#x43a;" u2="&#x3cc;" k="56" />
+<hkern u1="&#x43a;" u2="&#x3c3;" k="16" />
+<hkern u1="&#x43a;" u2="&#x3c2;" k="16" />
+<hkern u1="&#x43a;" u2="&#x3bf;" k="56" />
+<hkern u1="&#x43a;" u2="&#x3b1;" k="16" />
+<hkern u1="&#x43a;" u2="&#x3ac;" k="16" />
+<hkern u1="&#x43a;" u2="&#x1a1;" k="16" />
+<hkern u1="&#x43a;" u2="&#x153;" k="16" />
+<hkern u1="&#x43a;" u2="&#x151;" k="56" />
+<hkern u1="&#x43a;" u2="&#x14f;" k="56" />
+<hkern u1="&#x43a;" u2="&#x14d;" k="56" />
+<hkern u1="&#x43a;" u2="&#x123;" k="16" />
+<hkern u1="&#x43a;" u2="&#x121;" k="16" />
+<hkern u1="&#x43a;" u2="&#x11f;" k="16" />
+<hkern u1="&#x43a;" u2="&#x11d;" k="16" />
+<hkern u1="&#x43a;" u2="&#x11b;" k="16" />
+<hkern u1="&#x43a;" u2="&#x119;" k="16" />
+<hkern u1="&#x43a;" u2="&#x117;" k="16" />
+<hkern u1="&#x43a;" u2="&#x115;" k="16" />
+<hkern u1="&#x43a;" u2="&#x113;" k="16" />
+<hkern u1="&#x43a;" u2="&#x10f;" k="16" />
+<hkern u1="&#x43a;" u2="&#x10d;" k="16" />
+<hkern u1="&#x43a;" u2="&#x10b;" k="16" />
+<hkern u1="&#x43a;" u2="&#x109;" k="16" />
+<hkern u1="&#x43a;" u2="&#x107;" k="16" />
+<hkern u1="&#x43a;" u2="&#xf6;" k="56" />
+<hkern u1="&#x43a;" u2="&#xf5;" k="56" />
+<hkern u1="&#x43a;" u2="&#xf4;" k="56" />
+<hkern u1="&#x43a;" u2="&#xf3;" k="56" />
+<hkern u1="&#x43a;" u2="&#xf2;" k="56" />
+<hkern u1="&#x43a;" u2="&#xeb;" k="16" />
+<hkern u1="&#x43a;" u2="&#xea;" k="16" />
+<hkern u1="&#x43a;" u2="&#xe9;" k="16" />
+<hkern u1="&#x43a;" u2="&#xe8;" k="16" />
+<hkern u1="&#x43a;" u2="&#xe7;" k="16" />
+<hkern u1="&#x43a;" u2="q" k="16" />
+<hkern u1="&#x43a;" u2="o" k="56" />
+<hkern u1="&#x43a;" u2="g" k="16" />
+<hkern u1="&#x43a;" u2="e" k="16" />
+<hkern u1="&#x43a;" u2="d" k="16" />
+<hkern u1="&#x43a;" u2="c" k="16" />
+<hkern u1="&#x43e;" u2="&#x50f;" k="20" />
+<hkern u1="&#x43e;" u2="&#x505;" k="11" />
+<hkern u1="&#x43e;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x43e;" u2="&#x47f;" k="15" />
+<hkern u1="&#x43e;" u2="&#x461;" k="16" />
+<hkern u1="&#x43e;" u2="&#x442;" k="22" />
+<hkern u1="&#x43e;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x43e;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x440;" u2="&#x50f;" k="20" />
+<hkern u1="&#x440;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x440;" u2="&#x442;" k="21" />
+<hkern u1="&#x440;" u2="&#x434;" k="18" />
+<hkern u1="&#x440;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x440;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x442;" g2="Q.smcp" k="20" />
+<hkern u1="&#x442;" g2="S.smcp" k="11" />
+<hkern u1="&#x442;" g2="T.smcp" k="-14" />
+<hkern u1="&#x442;" g2="V.smcp" k="-13" />
+<hkern u1="&#x442;" g2="Y.smcp" k="-13" />
+<hkern u1="&#x442;" u2="&#x2033;" k="-13" />
+<hkern u1="&#x442;" u2="&#x2032;" k="-13" />
+<hkern u1="&#x442;" u2="&#x201d;" k="-13" />
+<hkern u1="&#x442;" u2="&#x201c;" k="-13" />
+<hkern u1="&#x442;" u2="&#x201b;" k="-13" />
+<hkern u1="&#x442;" u2="&#x2019;" k="-13" />
+<hkern u1="&#x442;" u2="&#x2018;" k="-13" />
+<hkern u1="&#x442;" u2="&#x1ef9;" k="-11" />
+<hkern u1="&#x442;" u2="&#x1ef7;" k="-11" />
+<hkern u1="&#x442;" u2="&#x1ef5;" k="-11" />
+<hkern u1="&#x442;" u2="&#x1ef3;" k="-11" />
+<hkern u1="&#x442;" u2="&#x1ee3;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ee1;" k="22" />
+<hkern u1="&#x442;" u2="&#x1edf;" k="18" />
+<hkern u1="&#x442;" u2="&#x1edd;" k="18" />
+<hkern u1="&#x442;" u2="&#x1edb;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ed9;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ed7;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ed5;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ed3;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ed1;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ecf;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ecd;" k="22" />
+<hkern u1="&#x442;" u2="&#x1ec7;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ec5;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ec3;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ec1;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ebf;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ebd;" k="18" />
+<hkern u1="&#x442;" u2="&#x1ebb;" k="18" />
+<hkern u1="&#x442;" u2="&#x1eb9;" k="18" />
+<hkern u1="&#x442;" u2="&#x1eb7;" k="16" />
+<hkern u1="&#x442;" u2="&#x1eb5;" k="16" />
+<hkern u1="&#x442;" u2="&#x1eb3;" k="16" />
+<hkern u1="&#x442;" u2="&#x1eb1;" k="16" />
+<hkern u1="&#x442;" u2="&#x1eaf;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ead;" k="16" />
+<hkern u1="&#x442;" u2="&#x1eab;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ea9;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ea7;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ea5;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ea3;" k="16" />
+<hkern u1="&#x442;" u2="&#x1ea1;" k="16" />
+<hkern u1="&#x442;" u2="&#x1e01;" k="16" />
+<hkern u1="&#x442;" u2="&#x513;" k="41" />
+<hkern u1="&#x442;" u2="&#x50d;" k="18" />
+<hkern u1="&#x442;" u2="&#x507;" k="-11" />
+<hkern u1="&#x442;" u2="&#x505;" k="-11" />
+<hkern u1="&#x442;" u2="&#x503;" k="18" />
+<hkern u1="&#x442;" u2="&#x502;" k="18" />
+<hkern u1="&#x442;" u2="&#x501;" k="18" />
+<hkern u1="&#x442;" u2="&#x4f3;" k="-11" />
+<hkern u1="&#x442;" u2="&#x4f1;" k="-11" />
+<hkern u1="&#x442;" u2="&#x4ef;" k="-11" />
+<hkern u1="&#x442;" u2="&#x4eb;" k="22" />
+<hkern u1="&#x442;" u2="&#x4e9;" k="18" />
+<hkern u1="&#x442;" u2="&#x4e7;" k="22" />
+<hkern u1="&#x442;" u2="&#x4db;" k="18" />
+<hkern u1="&#x442;" u2="&#x4d9;" k="18" />
+<hkern u1="&#x442;" u2="&#x4d7;" k="18" />
+<hkern u1="&#x442;" u2="&#x4d3;" k="16" />
+<hkern u1="&#x442;" u2="&#x4d1;" k="16" />
+<hkern u1="&#x442;" u2="&#x4c6;" k="41" />
+<hkern u1="&#x442;" u2="&#x4af;" k="-11" />
+<hkern u1="&#x442;" u2="&#x4ab;" k="18" />
+<hkern u1="&#x442;" u2="&#x4a9;" k="18" />
+<hkern u1="&#x442;" u2="&#x481;" k="18" />
+<hkern u1="&#x442;" u2="&#x47f;" k="-12" />
+<hkern u1="&#x442;" u2="&#x47d;" k="18" />
+<hkern u1="&#x442;" u2="&#x47b;" k="20" />
+<hkern u1="&#x442;" u2="&#x479;" k="18" />
+<hkern u1="&#x442;" u2="&#x477;" k="-11" />
+<hkern u1="&#x442;" u2="&#x475;" k="-11" />
+<hkern u1="&#x442;" u2="&#x473;" k="22" />
+<hkern u1="&#x442;" u2="&#x45e;" k="-11" />
+<hkern u1="&#x442;" u2="&#x459;" k="41" />
+<hkern u1="&#x442;" u2="&#x454;" k="18" />
+<hkern u1="&#x442;" u2="&#x451;" k="18" />
+<hkern u1="&#x442;" u2="&#x450;" k="18" />
+<hkern u1="&#x442;" u2="&#x444;" k="18" />
+<hkern u1="&#x442;" u2="&#x443;" k="-11" />
+<hkern u1="&#x442;" u2="&#x441;" k="18" />
+<hkern u1="&#x442;" u2="&#x43e;" k="22" />
+<hkern u1="&#x442;" u2="&#x43b;" k="41" />
+<hkern u1="&#x442;" u2="&#x435;" k="18" />
+<hkern u1="&#x442;" u2="&#x434;" k="56" />
+<hkern u1="&#x442;" u2="&#x430;" k="16" />
+<hkern u1="&#x442;" u2="&#x3cc;" k="22" />
+<hkern u1="&#x442;" u2="&#x3c3;" k="18" />
+<hkern u1="&#x442;" u2="&#x3c2;" k="18" />
+<hkern u1="&#x442;" u2="&#x3bf;" k="22" />
+<hkern u1="&#x442;" u2="&#x3bd;" k="-11" />
+<hkern u1="&#x442;" u2="&#x3b3;" k="-11" />
+<hkern u1="&#x442;" u2="&#x3b1;" k="18" />
+<hkern u1="&#x442;" u2="&#x3ac;" k="18" />
+<hkern u1="&#x442;" u2="&#x2bc;" k="-13" />
+<hkern u1="&#x442;" u2="&#x1fb;" k="16" />
+<hkern u1="&#x442;" u2="&#x1a1;" k="18" />
+<hkern u1="&#x442;" u2="&#x177;" k="-11" />
+<hkern u1="&#x442;" u2="&#x153;" k="18" />
+<hkern u1="&#x442;" u2="&#x151;" k="22" />
+<hkern u1="&#x442;" u2="&#x14f;" k="22" />
+<hkern u1="&#x442;" u2="&#x14d;" k="22" />
+<hkern u1="&#x442;" u2="&#x123;" k="18" />
+<hkern u1="&#x442;" u2="&#x121;" k="18" />
+<hkern u1="&#x442;" u2="&#x11f;" k="18" />
+<hkern u1="&#x442;" u2="&#x11d;" k="18" />
+<hkern u1="&#x442;" u2="&#x11b;" k="18" />
+<hkern u1="&#x442;" u2="&#x119;" k="18" />
+<hkern u1="&#x442;" u2="&#x117;" k="18" />
+<hkern u1="&#x442;" u2="&#x115;" k="18" />
+<hkern u1="&#x442;" u2="&#x113;" k="18" />
+<hkern u1="&#x442;" u2="&#x10f;" k="18" />
+<hkern u1="&#x442;" u2="&#x10d;" k="18" />
+<hkern u1="&#x442;" u2="&#x10b;" k="18" />
+<hkern u1="&#x442;" u2="&#x109;" k="18" />
+<hkern u1="&#x442;" u2="&#x107;" k="18" />
+<hkern u1="&#x442;" u2="&#x105;" k="16" />
+<hkern u1="&#x442;" u2="&#x103;" k="16" />
+<hkern u1="&#x442;" u2="&#x101;" k="16" />
+<hkern u1="&#x442;" u2="&#xff;" k="-11" />
+<hkern u1="&#x442;" u2="&#xfd;" k="-11" />
+<hkern u1="&#x442;" u2="&#xf6;" k="22" />
+<hkern u1="&#x442;" u2="&#xf5;" k="22" />
+<hkern u1="&#x442;" u2="&#xf4;" k="22" />
+<hkern u1="&#x442;" u2="&#xf3;" k="22" />
+<hkern u1="&#x442;" u2="&#xf2;" k="22" />
+<hkern u1="&#x442;" u2="&#xeb;" k="18" />
+<hkern u1="&#x442;" u2="&#xea;" k="18" />
+<hkern u1="&#x442;" u2="&#xe9;" k="18" />
+<hkern u1="&#x442;" u2="&#xe8;" k="18" />
+<hkern u1="&#x442;" u2="&#xe7;" k="18" />
+<hkern u1="&#x442;" u2="&#xe5;" k="16" />
+<hkern u1="&#x442;" u2="&#xe4;" k="16" />
+<hkern u1="&#x442;" u2="&#xe3;" k="16" />
+<hkern u1="&#x442;" u2="&#xe2;" k="16" />
+<hkern u1="&#x442;" u2="&#xe1;" k="16" />
+<hkern u1="&#x442;" u2="&#xe0;" k="16" />
+<hkern u1="&#x442;" u2="y" k="-11" />
+<hkern u1="&#x442;" u2="v" k="-11" />
+<hkern u1="&#x442;" u2="q" k="18" />
+<hkern u1="&#x442;" u2="o" k="22" />
+<hkern u1="&#x442;" u2="g" k="18" />
+<hkern u1="&#x442;" u2="f" k="-13" />
+<hkern u1="&#x442;" u2="e" k="18" />
+<hkern u1="&#x442;" u2="d" k="18" />
+<hkern u1="&#x442;" u2="c" k="18" />
+<hkern u1="&#x442;" u2="a" k="16" />
+<hkern u1="&#x442;" u2="&#x27;" k="-13" />
+<hkern u1="&#x442;" u2="&#x22;" k="-13" />
+<hkern u1="&#x443;" u2="&#x47b;" k="15" />
+<hkern u1="&#x443;" u2="&#x434;" k="56" />
+<hkern u1="&#x443;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x443;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x443;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x443;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x443;" u2="f" k="-13" />
+<hkern u1="&#x444;" u2="&#x50f;" k="20" />
+<hkern u1="&#x444;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x444;" u2="&#x442;" k="21" />
+<hkern u1="&#x444;" u2="&#x434;" k="18" />
+<hkern u1="&#x444;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x444;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x445;" u2="&#x47b;" k="15" />
+<hkern u1="&#x446;" u2="&#x513;" k="-16" />
+<hkern u1="&#x446;" u2="&#x50f;" k="16" />
+<hkern u1="&#x446;" u2="&#x4f5;" k="16" />
+<hkern u1="&#x446;" u2="&#x4cc;" k="16" />
+<hkern u1="&#x446;" u2="&#x4c6;" k="-16" />
+<hkern u1="&#x446;" u2="&#x4b9;" k="16" />
+<hkern u1="&#x446;" u2="&#x4b7;" k="16" />
+<hkern u1="&#x446;" u2="&#x4a1;" k="16" />
+<hkern u1="&#x446;" u2="&#x459;" k="-16" />
+<hkern u1="&#x446;" u2="&#x44f;" k="-12" />
+<hkern u1="&#x446;" u2="&#x447;" k="16" />
+<hkern u1="&#x446;" u2="&#x442;" k="16" />
+<hkern u1="&#x446;" u2="&#x43b;" k="-16" />
+<hkern u1="&#x446;" u2="&#x434;" k="-20" />
+<hkern u1="&#x449;" u2="&#x1ee3;" k="18" />
+<hkern u1="&#x449;" u2="&#x1edf;" k="18" />
+<hkern u1="&#x449;" u2="&#x1edd;" k="18" />
+<hkern u1="&#x449;" u2="&#x1edb;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ec7;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ec5;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ec3;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ec1;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ebf;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ebd;" k="18" />
+<hkern u1="&#x449;" u2="&#x1ebb;" k="18" />
+<hkern u1="&#x449;" u2="&#x1eb9;" k="18" />
+<hkern u1="&#x449;" u2="&#x513;" k="-14" />
+<hkern u1="&#x449;" u2="&#x50f;" k="29" />
+<hkern u1="&#x449;" u2="&#x50d;" k="18" />
+<hkern u1="&#x449;" u2="&#x503;" k="18" />
+<hkern u1="&#x449;" u2="&#x502;" k="18" />
+<hkern u1="&#x449;" u2="&#x501;" k="18" />
+<hkern u1="&#x449;" u2="&#x4f5;" k="29" />
+<hkern u1="&#x449;" u2="&#x4e9;" k="18" />
+<hkern u1="&#x449;" u2="&#x4db;" k="18" />
+<hkern u1="&#x449;" u2="&#x4d9;" k="18" />
+<hkern u1="&#x449;" u2="&#x4d7;" k="18" />
+<hkern u1="&#x449;" u2="&#x4cc;" k="29" />
+<hkern u1="&#x449;" u2="&#x4c6;" k="-14" />
+<hkern u1="&#x449;" u2="&#x4b9;" k="29" />
+<hkern u1="&#x449;" u2="&#x4b7;" k="29" />
+<hkern u1="&#x449;" u2="&#x4ab;" k="18" />
+<hkern u1="&#x449;" u2="&#x4a9;" k="18" />
+<hkern u1="&#x449;" u2="&#x4a1;" k="30" />
+<hkern u1="&#x449;" u2="&#x481;" k="18" />
+<hkern u1="&#x449;" u2="&#x47d;" k="18" />
+<hkern u1="&#x449;" u2="&#x479;" k="18" />
+<hkern u1="&#x449;" u2="&#x459;" k="-14" />
+<hkern u1="&#x449;" u2="&#x454;" k="18" />
+<hkern u1="&#x449;" u2="&#x451;" k="18" />
+<hkern u1="&#x449;" u2="&#x450;" k="18" />
+<hkern u1="&#x449;" u2="&#x447;" k="29" />
+<hkern u1="&#x449;" u2="&#x444;" k="18" />
+<hkern u1="&#x449;" u2="&#x442;" k="29" />
+<hkern u1="&#x449;" u2="&#x441;" k="18" />
+<hkern u1="&#x449;" u2="&#x43b;" k="-14" />
+<hkern u1="&#x449;" u2="&#x435;" k="18" />
+<hkern u1="&#x449;" u2="&#x434;" k="-18" />
+<hkern u1="&#x449;" u2="&#x3c3;" k="18" />
+<hkern u1="&#x449;" u2="&#x3c2;" k="18" />
+<hkern u1="&#x449;" u2="&#x3b1;" k="18" />
+<hkern u1="&#x449;" u2="&#x3ac;" k="18" />
+<hkern u1="&#x449;" u2="&#x1a1;" k="18" />
+<hkern u1="&#x449;" u2="&#x153;" k="18" />
+<hkern u1="&#x449;" u2="&#x123;" k="18" />
+<hkern u1="&#x449;" u2="&#x121;" k="18" />
+<hkern u1="&#x449;" u2="&#x11f;" k="18" />
+<hkern u1="&#x449;" u2="&#x11d;" k="18" />
+<hkern u1="&#x449;" u2="&#x11b;" k="18" />
+<hkern u1="&#x449;" u2="&#x119;" k="18" />
+<hkern u1="&#x449;" u2="&#x117;" k="18" />
+<hkern u1="&#x449;" u2="&#x115;" k="18" />
+<hkern u1="&#x449;" u2="&#x113;" k="18" />
+<hkern u1="&#x449;" u2="&#x10f;" k="18" />
+<hkern u1="&#x449;" u2="&#x10d;" k="18" />
+<hkern u1="&#x449;" u2="&#x10b;" k="18" />
+<hkern u1="&#x449;" u2="&#x109;" k="18" />
+<hkern u1="&#x449;" u2="&#x107;" k="18" />
+<hkern u1="&#x449;" u2="&#xeb;" k="18" />
+<hkern u1="&#x449;" u2="&#xea;" k="18" />
+<hkern u1="&#x449;" u2="&#xe9;" k="18" />
+<hkern u1="&#x449;" u2="&#xe8;" k="18" />
+<hkern u1="&#x449;" u2="&#xe7;" k="18" />
+<hkern u1="&#x449;" u2="q" k="18" />
+<hkern u1="&#x449;" u2="g" k="18" />
+<hkern u1="&#x449;" u2="e" k="18" />
+<hkern u1="&#x449;" u2="d" k="18" />
+<hkern u1="&#x449;" u2="c" k="18" />
+<hkern u1="&#x44a;" u2="&#x50f;" k="70" />
+<hkern u1="&#x44a;" u2="&#x507;" k="14" />
+<hkern u1="&#x44a;" u2="&#x505;" k="16" />
+<hkern u1="&#x44a;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x44a;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x44a;" u2="&#x47f;" k="37" />
+<hkern u1="&#x44a;" u2="&#x461;" k="39" />
+<hkern u1="&#x44a;" u2="&#x442;" k="70" />
+<hkern u1="&#x44c;" u2="&#x50f;" k="70" />
+<hkern u1="&#x44c;" u2="&#x507;" k="14" />
+<hkern u1="&#x44c;" u2="&#x505;" k="16" />
+<hkern u1="&#x44c;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x44c;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x44c;" u2="&#x47f;" k="37" />
+<hkern u1="&#x44c;" u2="&#x461;" k="39" />
+<hkern u1="&#x44c;" u2="&#x442;" k="70" />
+<hkern u1="&#x44d;" u2="&#x50f;" k="20" />
+<hkern u1="&#x44d;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x44d;" u2="&#x442;" k="21" />
+<hkern u1="&#x44d;" u2="&#x434;" k="18" />
+<hkern u1="&#x44d;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x44d;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x44e;" u2="&#x1ef9;" k="12" />
+<hkern u1="&#x44e;" u2="&#x1ef7;" k="12" />
+<hkern u1="&#x44e;" u2="&#x1ef5;" k="12" />
+<hkern u1="&#x44e;" u2="&#x1ef3;" k="12" />
+<hkern u1="&#x44e;" u2="&#x513;" k="13" />
+<hkern u1="&#x44e;" u2="&#x4fd;" k="16" />
+<hkern u1="&#x44e;" u2="&#x4f3;" k="12" />
+<hkern u1="&#x44e;" u2="&#x4f1;" k="12" />
+<hkern u1="&#x44e;" u2="&#x4ef;" k="12" />
+<hkern u1="&#x44e;" u2="&#x4dd;" k="16" />
+<hkern u1="&#x44e;" u2="&#x4c6;" k="13" />
+<hkern u1="&#x44e;" u2="&#x4c2;" k="16" />
+<hkern u1="&#x44e;" u2="&#x4b3;" k="16" />
+<hkern u1="&#x44e;" u2="&#x4af;" k="12" />
+<hkern u1="&#x44e;" u2="&#x497;" k="16" />
+<hkern u1="&#x44e;" u2="&#x477;" k="12" />
+<hkern u1="&#x44e;" u2="&#x475;" k="12" />
+<hkern u1="&#x44e;" u2="&#x45e;" k="12" />
+<hkern u1="&#x44e;" u2="&#x459;" k="13" />
+<hkern u1="&#x44e;" u2="&#x445;" k="16" />
+<hkern u1="&#x44e;" u2="&#x443;" k="12" />
+<hkern u1="&#x44e;" u2="&#x43b;" k="13" />
+<hkern u1="&#x44e;" u2="&#x436;" k="16" />
+<hkern u1="&#x44e;" u2="&#x434;" k="17" />
+<hkern u1="&#x44e;" u2="&#x3bd;" k="12" />
+<hkern u1="&#x44e;" u2="&#x3b3;" k="12" />
+<hkern u1="&#x44e;" u2="&#x177;" k="12" />
+<hkern u1="&#x44e;" u2="&#xff;" k="12" />
+<hkern u1="&#x44e;" u2="&#xfd;" k="12" />
+<hkern u1="&#x44e;" u2="y" k="12" />
+<hkern u1="&#x44e;" u2="x" k="16" />
+<hkern u1="&#x44e;" u2="v" k="12" />
+<hkern u1="&#x450;" u2="&#x442;" k="11" />
+<hkern u1="&#x451;" u2="&#x442;" k="11" />
+<hkern u1="&#x453;" u2="&#x47b;" k="18" />
+<hkern u1="&#x453;" u2="&#x434;" k="55" />
+<hkern u1="&#x454;" u2="&#x2033;" k="42" />
+<hkern u1="&#x454;" u2="&#x2032;" k="42" />
+<hkern u1="&#x454;" u2="&#x201d;" k="42" />
+<hkern u1="&#x454;" u2="&#x201c;" k="42" />
+<hkern u1="&#x454;" u2="&#x201b;" k="42" />
+<hkern u1="&#x454;" u2="&#x2019;" k="42" />
+<hkern u1="&#x454;" u2="&#x2018;" k="42" />
+<hkern u1="&#x454;" u2="&#x2bc;" k="42" />
+<hkern u1="&#x454;" u2="&#x27;" k="42" />
+<hkern u1="&#x454;" u2="&#x22;" k="42" />
+<hkern u1="&#x459;" u2="&#x50f;" k="70" />
+<hkern u1="&#x459;" u2="&#x507;" k="14" />
+<hkern u1="&#x459;" u2="&#x505;" k="16" />
+<hkern u1="&#x459;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x459;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x459;" u2="&#x47f;" k="37" />
+<hkern u1="&#x459;" u2="&#x461;" k="39" />
+<hkern u1="&#x459;" u2="&#x442;" k="70" />
+<hkern u1="&#x45a;" u2="&#x50f;" k="70" />
+<hkern u1="&#x45a;" u2="&#x507;" k="14" />
+<hkern u1="&#x45a;" u2="&#x505;" k="16" />
+<hkern u1="&#x45a;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x45a;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x45a;" u2="&#x47f;" k="37" />
+<hkern u1="&#x45a;" u2="&#x461;" k="39" />
+<hkern u1="&#x45a;" u2="&#x442;" k="70" />
+<hkern u1="&#x45e;" u2="&#x47b;" k="15" />
+<hkern u1="&#x45e;" u2="&#x434;" k="56" />
+<hkern u1="&#x45e;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x45e;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x45e;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x45e;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x45e;" u2="f" k="-13" />
+<hkern u1="&#x462;" u2="&#x50f;" k="47" />
+<hkern u1="&#x462;" u2="&#x50e;" k="96" />
+<hkern u1="&#x462;" u2="&#x506;" k="20" />
+<hkern u1="&#x462;" u2="&#x504;" k="47" />
+<hkern u1="&#x462;" u2="&#x4bc;" k="33" />
+<hkern u1="&#x462;" u2="&#x4b8;" k="25" />
+<hkern u1="&#x462;" u2="&#x4a1;" k="50" />
+<hkern u1="&#x462;" u2="&#x442;" k="49" />
+<hkern u1="&#x462;" u2="&#x42c;" k="61" />
+<hkern u1="&#x463;" u2="&#x50f;" k="70" />
+<hkern u1="&#x463;" u2="&#x507;" k="14" />
+<hkern u1="&#x463;" u2="&#x505;" k="16" />
+<hkern u1="&#x463;" u2="&#x4b9;" k="19" />
+<hkern u1="&#x463;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x463;" u2="&#x47f;" k="37" />
+<hkern u1="&#x463;" u2="&#x461;" k="39" />
+<hkern u1="&#x463;" u2="&#x442;" k="70" />
+<hkern u1="&#x466;" g2="T.smcp" k="57" />
+<hkern u1="&#x466;" g2="U.smcp" k="15" />
+<hkern u1="&#x466;" g2="V.smcp" k="51" />
+<hkern u1="&#x466;" g2="W.smcp" k="35" />
+<hkern u1="&#x466;" g2="Y.smcp" k="60" />
+<hkern u1="&#x466;" u2="&#x50f;" k="57" />
+<hkern u1="&#x466;" u2="&#x50e;" k="88" />
+<hkern u1="&#x466;" u2="&#x506;" k="54" />
+<hkern u1="&#x466;" u2="&#x504;" k="80" />
+<hkern u1="&#x466;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x466;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x466;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x466;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x466;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x466;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x466;" u2="&#x442;" k="54" />
+<hkern u1="&#x466;" u2="&#x42c;" k="59" />
+<hkern u1="&#x466;" u2="&#x414;" k="-19" />
+<hkern u1="&#x466;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x466;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x466;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x466;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x466;" u2="&#x1af;" k="18" />
+<hkern u1="&#x466;" u2="w" k="33" />
+<hkern u1="&#x466;" u2="t" k="17" />
+<hkern u1="&#x466;" u2="&#x3f;" k="80" />
+<hkern u1="&#x473;" u2="&#x50f;" k="20" />
+<hkern u1="&#x473;" u2="&#x505;" k="11" />
+<hkern u1="&#x473;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x473;" u2="&#x47f;" k="15" />
+<hkern u1="&#x473;" u2="&#x461;" k="16" />
+<hkern u1="&#x473;" u2="&#x442;" k="22" />
+<hkern u1="&#x473;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x473;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x474;" g2="Q.smcp" k="39" />
+<hkern u1="&#x474;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x474;" u2="r" k="30" />
+<hkern u1="&#x474;" u2="]" k="-17" />
+<hkern u1="&#x474;" u2="&#x29;" k="-20" />
+<hkern u1="&#x475;" u2="&#x47b;" k="15" />
+<hkern u1="&#x475;" u2="&#x434;" k="56" />
+<hkern u1="&#x475;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x475;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x475;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x475;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x475;" u2="f" k="-13" />
+<hkern u1="&#x476;" g2="Q.smcp" k="39" />
+<hkern u1="&#x476;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x476;" u2="r" k="30" />
+<hkern u1="&#x476;" u2="]" k="-17" />
+<hkern u1="&#x476;" u2="&#x29;" k="-20" />
+<hkern u1="&#x477;" u2="&#x47b;" k="15" />
+<hkern u1="&#x477;" u2="&#x434;" k="56" />
+<hkern u1="&#x477;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x477;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x477;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x477;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x477;" u2="f" k="-13" />
+<hkern u1="&#x481;" u2="&#x2033;" k="40" />
+<hkern u1="&#x481;" u2="&#x2032;" k="40" />
+<hkern u1="&#x481;" u2="&#x201d;" k="40" />
+<hkern u1="&#x481;" u2="&#x201c;" k="40" />
+<hkern u1="&#x481;" u2="&#x201b;" k="40" />
+<hkern u1="&#x481;" u2="&#x2019;" k="40" />
+<hkern u1="&#x481;" u2="&#x2018;" k="40" />
+<hkern u1="&#x481;" u2="&#x2bc;" k="40" />
+<hkern u1="&#x481;" u2="&#x27;" k="40" />
+<hkern u1="&#x481;" u2="&#x22;" k="40" />
+<hkern u1="&#x48f;" u2="&#x50f;" k="20" />
+<hkern u1="&#x48f;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x48f;" u2="&#x442;" k="21" />
+<hkern u1="&#x48f;" u2="&#x434;" k="18" />
+<hkern u1="&#x48f;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x48f;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x490;" u2="&#x510;" k="43" />
+<hkern u1="&#x490;" u2="&#x50f;" k="208" />
+<hkern u1="&#x490;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x490;" u2="&#x50b;" k="246" />
+<hkern u1="&#x490;" u2="&#x507;" k="161" />
+<hkern u1="&#x490;" u2="&#x505;" k="207" />
+<hkern u1="&#x490;" u2="&#x500;" k="273" />
+<hkern u1="&#x490;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x490;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x490;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x490;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x490;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x490;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x490;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x490;" u2="&#x49d;" k="242" />
+<hkern u1="&#x490;" u2="&#x491;" k="196" />
+<hkern u1="&#x490;" u2="&#x48f;" k="235" />
+<hkern u1="&#x490;" u2="&#x47f;" k="84" />
+<hkern u1="&#x490;" u2="&#x47b;" k="279" />
+<hkern u1="&#x490;" u2="&#x461;" k="239" />
+<hkern u1="&#x490;" u2="&#x45f;" k="242" />
+<hkern u1="&#x490;" u2="&#x44f;" k="249" />
+<hkern u1="&#x490;" u2="&#x44d;" k="237" />
+<hkern u1="&#x490;" u2="&#x44b;" k="242" />
+<hkern u1="&#x490;" u2="&#x442;" k="152" />
+<hkern u1="&#x490;" u2="&#x437;" k="237" />
+<hkern u1="&#x490;" u2="&#x434;" k="258" />
+<hkern u1="&#x490;" u2="&#x432;" k="183" />
+<hkern u1="&#x490;" u2="&#x431;" k="67" />
+<hkern u1="&#x490;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x490;" u2="&#x414;" k="157" />
+<hkern u1="&#x490;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x490;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x490;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x490;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x490;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x490;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x490;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x490;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x490;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x490;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x490;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x490;" u2="&#xf8;" k="181" />
+<hkern u1="&#x490;" u2="&#xe6;" k="163" />
+<hkern u1="&#x490;" u2="&#xc6;" k="340" />
+<hkern u1="&#x490;" u2="&#xbb;" k="270" />
+<hkern u1="&#x490;" u2="&#xab;" k="277" />
+<hkern u1="&#x490;" u2="w" k="99" />
+<hkern u1="&#x490;" u2="r" k="130" />
+<hkern u1="&#x491;" u2="&#x47b;" k="18" />
+<hkern u1="&#x491;" u2="&#x434;" k="55" />
+<hkern u1="&#x492;" u2="&#x510;" k="43" />
+<hkern u1="&#x492;" u2="&#x50f;" k="208" />
+<hkern u1="&#x492;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x492;" u2="&#x50b;" k="246" />
+<hkern u1="&#x492;" u2="&#x507;" k="161" />
+<hkern u1="&#x492;" u2="&#x505;" k="207" />
+<hkern u1="&#x492;" u2="&#x500;" k="273" />
+<hkern u1="&#x492;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x492;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x492;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x492;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x492;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x492;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x492;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x492;" u2="&#x49d;" k="242" />
+<hkern u1="&#x492;" u2="&#x491;" k="196" />
+<hkern u1="&#x492;" u2="&#x48f;" k="235" />
+<hkern u1="&#x492;" u2="&#x47f;" k="84" />
+<hkern u1="&#x492;" u2="&#x47b;" k="279" />
+<hkern u1="&#x492;" u2="&#x461;" k="239" />
+<hkern u1="&#x492;" u2="&#x45f;" k="242" />
+<hkern u1="&#x492;" u2="&#x44f;" k="249" />
+<hkern u1="&#x492;" u2="&#x44d;" k="237" />
+<hkern u1="&#x492;" u2="&#x44b;" k="242" />
+<hkern u1="&#x492;" u2="&#x442;" k="152" />
+<hkern u1="&#x492;" u2="&#x437;" k="237" />
+<hkern u1="&#x492;" u2="&#x434;" k="258" />
+<hkern u1="&#x492;" u2="&#x432;" k="183" />
+<hkern u1="&#x492;" u2="&#x431;" k="67" />
+<hkern u1="&#x492;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x492;" u2="&#x414;" k="157" />
+<hkern u1="&#x492;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x492;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x492;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x492;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x492;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x492;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x492;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x492;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x492;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x492;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x492;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x492;" u2="&#xf8;" k="181" />
+<hkern u1="&#x492;" u2="&#xe6;" k="163" />
+<hkern u1="&#x492;" u2="&#xc6;" k="340" />
+<hkern u1="&#x492;" u2="&#xbb;" k="270" />
+<hkern u1="&#x492;" u2="&#xab;" k="277" />
+<hkern u1="&#x492;" u2="w" k="99" />
+<hkern u1="&#x492;" u2="r" k="130" />
+<hkern u1="&#x496;" g2="Q.smcp" k="23" />
+<hkern u1="&#x496;" u2="&#x510;" k="14" />
+<hkern u1="&#x496;" u2="&#x50f;" k="42" />
+<hkern u1="&#x496;" u2="&#x506;" k="-12" />
+<hkern u1="&#x496;" u2="&#x504;" k="-13" />
+<hkern u1="&#x496;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x496;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x496;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x496;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x496;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x496;" u2="&#x442;" k="41" />
+<hkern u1="&#x496;" u2="&#x431;" k="23" />
+<hkern u1="&#x496;" u2="&#x414;" k="-18" />
+<hkern u1="&#x496;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x496;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x496;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x496;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x496;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x496;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x496;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x496;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x497;" u2="&#x47b;" k="15" />
+<hkern u1="&#x49a;" g2="Q.smcp" k="25" />
+<hkern u1="&#x49a;" u2="&#x510;" k="17" />
+<hkern u1="&#x49a;" u2="&#x50f;" k="53" />
+<hkern u1="&#x49a;" u2="&#x507;" k="52" />
+<hkern u1="&#x49a;" u2="&#x505;" k="52" />
+<hkern u1="&#x49a;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x49a;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x49a;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x49a;" u2="&#x47f;" k="56" />
+<hkern u1="&#x49a;" u2="&#x47b;" k="46" />
+<hkern u1="&#x49a;" u2="&#x461;" k="78" />
+<hkern u1="&#x49a;" u2="&#x442;" k="71" />
+<hkern u1="&#x49a;" u2="&#x431;" k="41" />
+<hkern u1="&#x49a;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x49a;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x49a;" u2="w" k="63" />
+<hkern u1="&#x49c;" g2="Q.smcp" k="25" />
+<hkern u1="&#x49c;" u2="&#x510;" k="17" />
+<hkern u1="&#x49c;" u2="&#x50f;" k="53" />
+<hkern u1="&#x49c;" u2="&#x507;" k="52" />
+<hkern u1="&#x49c;" u2="&#x505;" k="52" />
+<hkern u1="&#x49c;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x49c;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x49c;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x49c;" u2="&#x47f;" k="56" />
+<hkern u1="&#x49c;" u2="&#x47b;" k="46" />
+<hkern u1="&#x49c;" u2="&#x461;" k="78" />
+<hkern u1="&#x49c;" u2="&#x442;" k="71" />
+<hkern u1="&#x49c;" u2="&#x431;" k="41" />
+<hkern u1="&#x49c;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x49c;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x49c;" u2="w" k="63" />
+<hkern u1="&#x49e;" g2="Q.smcp" k="25" />
+<hkern u1="&#x49e;" u2="&#x510;" k="17" />
+<hkern u1="&#x49e;" u2="&#x50f;" k="53" />
+<hkern u1="&#x49e;" u2="&#x507;" k="52" />
+<hkern u1="&#x49e;" u2="&#x505;" k="52" />
+<hkern u1="&#x49e;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x49e;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x49e;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x49e;" u2="&#x47f;" k="56" />
+<hkern u1="&#x49e;" u2="&#x47b;" k="46" />
+<hkern u1="&#x49e;" u2="&#x461;" k="78" />
+<hkern u1="&#x49e;" u2="&#x442;" k="71" />
+<hkern u1="&#x49e;" u2="&#x431;" k="41" />
+<hkern u1="&#x49e;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x49e;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x49e;" u2="w" k="63" />
+<hkern u1="&#x4a0;" g2="Q.smcp" k="25" />
+<hkern u1="&#x4a0;" u2="&#x510;" k="17" />
+<hkern u1="&#x4a0;" u2="&#x50f;" k="53" />
+<hkern u1="&#x4a0;" u2="&#x507;" k="52" />
+<hkern u1="&#x4a0;" u2="&#x505;" k="52" />
+<hkern u1="&#x4a0;" u2="&#x4d8;" k="28" />
+<hkern u1="&#x4a0;" u2="&#x4b9;" k="59" />
+<hkern u1="&#x4a0;" u2="&#x4a1;" k="96" />
+<hkern u1="&#x4a0;" u2="&#x47f;" k="56" />
+<hkern u1="&#x4a0;" u2="&#x47b;" k="46" />
+<hkern u1="&#x4a0;" u2="&#x461;" k="78" />
+<hkern u1="&#x4a0;" u2="&#x442;" k="71" />
+<hkern u1="&#x4a0;" u2="&#x431;" k="41" />
+<hkern u1="&#x4a0;" u2="&#x3c4;" k="76" />
+<hkern u1="&#x4a0;" u2="&#x3a6;" k="59" />
+<hkern u1="&#x4a0;" u2="w" k="63" />
+<hkern u1="&#x4a2;" u2="&#x50e;" k="28" />
+<hkern u1="&#x4a2;" u2="&#x506;" k="30" />
+<hkern u1="&#x4a2;" u2="&#x504;" k="29" />
+<hkern u1="&#x4a2;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x4a2;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x4a2;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x4a2;" u2="&#x434;" k="-21" />
+<hkern u1="&#x4a2;" u2="&#x414;" k="-21" />
+<hkern u1="&#x4aa;" u2="&#x4bd;" k="19" />
+<hkern u1="&#x4aa;" u2="&#x7d;" k="17" />
+<hkern u1="&#x4aa;" u2="]" k="12" />
+<hkern u1="&#x4aa;" u2="&#x29;" k="26" />
+<hkern u1="&#x4ac;" g2="Q.smcp" k="71" />
+<hkern u1="&#x4ac;" g2="S.smcp" k="68" />
+<hkern u1="&#x4ac;" g2="T.smcp" k="15" />
+<hkern u1="&#x4ac;" g2="W.smcp" k="15" />
+<hkern u1="&#x4ac;" g2="X.smcp" k="19" />
+<hkern u1="&#x4ac;" u2="&#x510;" k="14" />
+<hkern u1="&#x4ac;" u2="&#x50f;" k="111" />
+<hkern u1="&#x4ac;" u2="&#x50e;" k="-15" />
+<hkern u1="&#x4ac;" u2="&#x50b;" k="133" />
+<hkern u1="&#x4ac;" u2="&#x507;" k="83" />
+<hkern u1="&#x4ac;" u2="&#x505;" k="110" />
+<hkern u1="&#x4ac;" u2="&#x500;" k="149" />
+<hkern u1="&#x4ac;" u2="&#x4d8;" k="26" />
+<hkern u1="&#x4ac;" u2="&#x4bd;" k="148" />
+<hkern u1="&#x4ac;" u2="&#x4bc;" k="102" />
+<hkern u1="&#x4ac;" u2="&#x4bb;" k="132" />
+<hkern u1="&#x4ac;" u2="&#x4b9;" k="132" />
+<hkern u1="&#x4ac;" u2="&#x4a7;" k="96" />
+<hkern u1="&#x4ac;" u2="&#x4a1;" k="77" />
+<hkern u1="&#x4ac;" u2="&#x49d;" k="131" />
+<hkern u1="&#x4ac;" u2="&#x491;" k="104" />
+<hkern u1="&#x4ac;" u2="&#x48f;" k="127" />
+<hkern u1="&#x4ac;" u2="&#x47f;" k="38" />
+<hkern u1="&#x4ac;" u2="&#x47b;" k="153" />
+<hkern u1="&#x4ac;" u2="&#x461;" k="129" />
+<hkern u1="&#x4ac;" u2="&#x45f;" k="131" />
+<hkern u1="&#x4ac;" u2="&#x44f;" k="135" />
+<hkern u1="&#x4ac;" u2="&#x44d;" k="128" />
+<hkern u1="&#x4ac;" u2="&#x44b;" k="131" />
+<hkern u1="&#x4ac;" u2="&#x442;" k="78" />
+<hkern u1="&#x4ac;" u2="&#x437;" k="128" />
+<hkern u1="&#x4ac;" u2="&#x434;" k="140" />
+<hkern u1="&#x4ac;" u2="&#x432;" k="96" />
+<hkern u1="&#x4ac;" u2="&#x431;" k="28" />
+<hkern u1="&#x4ac;" u2="&#x42c;" k="-15" />
+<hkern u1="&#x4ac;" u2="&#x414;" k="81" />
+<hkern u1="&#x4ac;" u2="&#x3c9;" k="132" />
+<hkern u1="&#x4ac;" u2="&#x3c8;" k="131" />
+<hkern u1="&#x4ac;" u2="&#x3c7;" k="77" />
+<hkern u1="&#x4ac;" u2="&#x3c6;" k="130" />
+<hkern u1="&#x4ac;" u2="&#x3c4;" k="78" />
+<hkern u1="&#x4ac;" u2="&#x3c1;" k="135" />
+<hkern u1="&#x4ac;" u2="&#x3c0;" k="101" />
+<hkern u1="&#x4ac;" u2="&#x3b9;" k="133" />
+<hkern u1="&#x4ac;" u2="&#x3b5;" k="130" />
+<hkern u1="&#x4ac;" u2="&#x3b4;" k="15" />
+<hkern u1="&#x4ac;" u2="&#x3a6;" k="72" />
+<hkern u1="&#x4ac;" u2="&#xf8;" k="95" />
+<hkern u1="&#x4ac;" u2="&#xe6;" k="84" />
+<hkern u1="&#x4ac;" u2="&#xc6;" k="188" />
+<hkern u1="&#x4ac;" u2="&#xbb;" k="147" />
+<hkern u1="&#x4ac;" u2="&#xab;" k="151" />
+<hkern u1="&#x4ac;" u2="w" k="47" />
+<hkern u1="&#x4ac;" u2="r" k="65" />
+<hkern u1="&#x4ae;" g2="Q.smcp" k="53" />
+<hkern u1="&#x4ae;" g2="T.smcp" k="13" />
+<hkern u1="&#x4ae;" g2="W.smcp" k="13" />
+<hkern u1="&#x4ae;" g2="X.smcp" k="17" />
+<hkern u1="&#x4ae;" u2="&#x2022;" k="45" />
+<hkern u1="&#x4ae;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x4ae;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x4ae;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x4ae;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x4ae;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x4ae;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x4ae;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x4ae;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x4ae;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x4ae;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x4ae;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x4ae;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x4ae;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x4ae;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x4ae;" u2="&#xf8;" k="64" />
+<hkern u1="&#x4ae;" u2="&#xe6;" k="63" />
+<hkern u1="&#x4ae;" u2="&#xc6;" k="96" />
+<hkern u1="&#x4ae;" u2="&#xbb;" k="51" />
+<hkern u1="&#x4ae;" u2="&#xab;" k="82" />
+<hkern u1="&#x4ae;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x4ae;" u2="t" k="22" />
+<hkern u1="&#x4ae;" u2="r" k="40" />
+<hkern u1="&#x4ae;" u2="f" k="22" />
+<hkern u1="&#x4ae;" u2="]" k="-18" />
+<hkern u1="&#x4ae;" u2="&#x2a;" k="49" />
+<hkern u1="&#x4ae;" u2="&#x29;" k="-20" />
+<hkern u1="&#x4ae;" u2="&#x26;" k="30" />
+<hkern u1="&#x4af;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4af;" u2="&#x434;" k="56" />
+<hkern u1="&#x4af;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x4af;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x4af;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x4af;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x4af;" u2="f" k="-13" />
+<hkern u1="&#x4b0;" g2="Q.smcp" k="53" />
+<hkern u1="&#x4b0;" g2="T.smcp" k="13" />
+<hkern u1="&#x4b0;" g2="W.smcp" k="13" />
+<hkern u1="&#x4b0;" g2="X.smcp" k="17" />
+<hkern u1="&#x4b0;" u2="&#x2022;" k="45" />
+<hkern u1="&#x4b0;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x4b0;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x4b0;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x4b0;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x4b0;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x4b0;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x4b0;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x4b0;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x4b0;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x4b0;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x4b0;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x4b0;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x4b0;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x4b0;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x4b0;" u2="&#xf8;" k="64" />
+<hkern u1="&#x4b0;" u2="&#xe6;" k="63" />
+<hkern u1="&#x4b0;" u2="&#xc6;" k="96" />
+<hkern u1="&#x4b0;" u2="&#xbb;" k="51" />
+<hkern u1="&#x4b0;" u2="&#xab;" k="82" />
+<hkern u1="&#x4b0;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x4b0;" u2="t" k="22" />
+<hkern u1="&#x4b0;" u2="r" k="40" />
+<hkern u1="&#x4b0;" u2="f" k="22" />
+<hkern u1="&#x4b0;" u2="]" k="-18" />
+<hkern u1="&#x4b0;" u2="&#x2a;" k="49" />
+<hkern u1="&#x4b0;" u2="&#x29;" k="-20" />
+<hkern u1="&#x4b0;" u2="&#x26;" k="30" />
+<hkern u1="&#x4b2;" g2="Q.smcp" k="23" />
+<hkern u1="&#x4b2;" u2="&#x510;" k="14" />
+<hkern u1="&#x4b2;" u2="&#x50f;" k="42" />
+<hkern u1="&#x4b2;" u2="&#x506;" k="-12" />
+<hkern u1="&#x4b2;" u2="&#x504;" k="-13" />
+<hkern u1="&#x4b2;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x4b2;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x4b2;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x4b2;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x4b2;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x4b2;" u2="&#x442;" k="41" />
+<hkern u1="&#x4b2;" u2="&#x431;" k="23" />
+<hkern u1="&#x4b2;" u2="&#x414;" k="-18" />
+<hkern u1="&#x4b2;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x4b2;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x4b2;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x4b2;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x4b2;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4b2;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x4b2;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x4b2;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x4b3;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4c0;" u2="&#x50e;" k="28" />
+<hkern u1="&#x4c0;" u2="&#x506;" k="30" />
+<hkern u1="&#x4c0;" u2="&#x504;" k="29" />
+<hkern u1="&#x4c0;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x4c0;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x4c0;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x4c0;" u2="&#x434;" k="-21" />
+<hkern u1="&#x4c0;" u2="&#x414;" k="-21" />
+<hkern u1="&#x4c1;" g2="Q.smcp" k="23" />
+<hkern u1="&#x4c1;" u2="&#x510;" k="14" />
+<hkern u1="&#x4c1;" u2="&#x50f;" k="42" />
+<hkern u1="&#x4c1;" u2="&#x506;" k="-12" />
+<hkern u1="&#x4c1;" u2="&#x504;" k="-13" />
+<hkern u1="&#x4c1;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x4c1;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x4c1;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x4c1;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x4c1;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x4c1;" u2="&#x442;" k="41" />
+<hkern u1="&#x4c1;" u2="&#x431;" k="23" />
+<hkern u1="&#x4c1;" u2="&#x414;" k="-18" />
+<hkern u1="&#x4c1;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x4c1;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x4c1;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x4c1;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x4c1;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4c1;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x4c1;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x4c1;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x4c2;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4c9;" u2="&#x50e;" k="28" />
+<hkern u1="&#x4c9;" u2="&#x506;" k="30" />
+<hkern u1="&#x4c9;" u2="&#x504;" k="29" />
+<hkern u1="&#x4c9;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x4c9;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x4c9;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x4c9;" u2="&#x434;" k="-21" />
+<hkern u1="&#x4c9;" u2="&#x414;" k="-21" />
+<hkern u1="&#x4cd;" u2="&#x50e;" k="28" />
+<hkern u1="&#x4cd;" u2="&#x506;" k="30" />
+<hkern u1="&#x4cd;" u2="&#x504;" k="29" />
+<hkern u1="&#x4cd;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x4cd;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x4cd;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x4cd;" u2="&#x434;" k="-21" />
+<hkern u1="&#x4cd;" u2="&#x414;" k="-21" />
+<hkern u1="&#x4cf;" u2="&#x50e;" k="28" />
+<hkern u1="&#x4cf;" u2="&#x506;" k="30" />
+<hkern u1="&#x4cf;" u2="&#x504;" k="29" />
+<hkern u1="&#x4cf;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x4cf;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x4cf;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x4cf;" u2="&#x434;" k="-21" />
+<hkern u1="&#x4cf;" u2="&#x414;" k="-21" />
+<hkern u1="&#x4d0;" g2="T.smcp" k="57" />
+<hkern u1="&#x4d0;" g2="U.smcp" k="15" />
+<hkern u1="&#x4d0;" g2="V.smcp" k="51" />
+<hkern u1="&#x4d0;" g2="W.smcp" k="35" />
+<hkern u1="&#x4d0;" g2="Y.smcp" k="60" />
+<hkern u1="&#x4d0;" u2="&#x50f;" k="57" />
+<hkern u1="&#x4d0;" u2="&#x50e;" k="88" />
+<hkern u1="&#x4d0;" u2="&#x506;" k="54" />
+<hkern u1="&#x4d0;" u2="&#x504;" k="80" />
+<hkern u1="&#x4d0;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x4d0;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x4d0;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x4d0;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x4d0;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x4d0;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x4d0;" u2="&#x442;" k="54" />
+<hkern u1="&#x4d0;" u2="&#x42c;" k="59" />
+<hkern u1="&#x4d0;" u2="&#x414;" k="-19" />
+<hkern u1="&#x4d0;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x4d0;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4d0;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x4d0;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x4d0;" u2="&#x1af;" k="18" />
+<hkern u1="&#x4d0;" u2="w" k="33" />
+<hkern u1="&#x4d0;" u2="t" k="17" />
+<hkern u1="&#x4d0;" u2="&#x3f;" k="80" />
+<hkern u1="&#x4d1;" u2="&#x50f;" k="15" />
+<hkern u1="&#x4d1;" u2="&#x507;" k="13" />
+<hkern u1="&#x4d1;" u2="&#x505;" k="13" />
+<hkern u1="&#x4d1;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x4d1;" u2="&#x47f;" k="13" />
+<hkern u1="&#x4d1;" u2="&#x461;" k="15" />
+<hkern u1="&#x4d1;" u2="&#x442;" k="16" />
+<hkern u1="&#x4d2;" g2="T.smcp" k="57" />
+<hkern u1="&#x4d2;" g2="U.smcp" k="15" />
+<hkern u1="&#x4d2;" g2="V.smcp" k="51" />
+<hkern u1="&#x4d2;" g2="W.smcp" k="35" />
+<hkern u1="&#x4d2;" g2="Y.smcp" k="60" />
+<hkern u1="&#x4d2;" u2="&#x50f;" k="57" />
+<hkern u1="&#x4d2;" u2="&#x50e;" k="88" />
+<hkern u1="&#x4d2;" u2="&#x506;" k="54" />
+<hkern u1="&#x4d2;" u2="&#x504;" k="80" />
+<hkern u1="&#x4d2;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x4d2;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x4d2;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x4d2;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x4d2;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x4d2;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x4d2;" u2="&#x442;" k="54" />
+<hkern u1="&#x4d2;" u2="&#x42c;" k="59" />
+<hkern u1="&#x4d2;" u2="&#x414;" k="-19" />
+<hkern u1="&#x4d2;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x4d2;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4d2;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x4d2;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x4d2;" u2="&#x1af;" k="18" />
+<hkern u1="&#x4d2;" u2="w" k="33" />
+<hkern u1="&#x4d2;" u2="t" k="17" />
+<hkern u1="&#x4d2;" u2="&#x3f;" k="80" />
+<hkern u1="&#x4d3;" u2="&#x50f;" k="15" />
+<hkern u1="&#x4d3;" u2="&#x507;" k="13" />
+<hkern u1="&#x4d3;" u2="&#x505;" k="13" />
+<hkern u1="&#x4d3;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x4d3;" u2="&#x47f;" k="13" />
+<hkern u1="&#x4d3;" u2="&#x461;" k="15" />
+<hkern u1="&#x4d3;" u2="&#x442;" k="16" />
+<hkern u1="&#x4d6;" g2="V.smcp" k="16" />
+<hkern u1="&#x4d6;" g2="W.smcp" k="19" />
+<hkern u1="&#x4d6;" g2="Y.smcp" k="16" />
+<hkern u1="&#x4d6;" u2="w" k="22" />
+<hkern u1="&#x4d6;" u2="f" k="18" />
+<hkern u1="&#x4d7;" u2="&#x442;" k="11" />
+<hkern u1="&#x4d9;" u2="&#x442;" k="11" />
+<hkern u1="&#x4db;" u2="&#x442;" k="11" />
+<hkern u1="&#x4dc;" g2="Q.smcp" k="23" />
+<hkern u1="&#x4dc;" u2="&#x510;" k="14" />
+<hkern u1="&#x4dc;" u2="&#x50f;" k="42" />
+<hkern u1="&#x4dc;" u2="&#x506;" k="-12" />
+<hkern u1="&#x4dc;" u2="&#x504;" k="-13" />
+<hkern u1="&#x4dc;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x4dc;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x4dc;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x4dc;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x4dc;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x4dc;" u2="&#x442;" k="41" />
+<hkern u1="&#x4dc;" u2="&#x431;" k="23" />
+<hkern u1="&#x4dc;" u2="&#x414;" k="-18" />
+<hkern u1="&#x4dc;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x4dc;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x4dc;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x4dc;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x4dc;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4dc;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x4dc;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x4dc;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x4dd;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4e6;" g2="X.smcp" k="11" />
+<hkern u1="&#x4e6;" u2="&#x50e;" k="32" />
+<hkern u1="&#x4e6;" u2="&#x42c;" k="32" />
+<hkern u1="&#x4e6;" u2="&#x414;" k="33" />
+<hkern u1="&#x4e6;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x4e6;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x4e6;" u2="&#x39e;" k="13" />
+<hkern u1="&#x4e6;" u2="&#xc6;" k="33" />
+<hkern u1="&#x4e7;" u2="&#x50f;" k="20" />
+<hkern u1="&#x4e7;" u2="&#x505;" k="11" />
+<hkern u1="&#x4e7;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x4e7;" u2="&#x47f;" k="15" />
+<hkern u1="&#x4e7;" u2="&#x461;" k="16" />
+<hkern u1="&#x4e7;" u2="&#x442;" k="22" />
+<hkern u1="&#x4e7;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x4e7;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x4eb;" u2="&#x50f;" k="20" />
+<hkern u1="&#x4eb;" u2="&#x505;" k="11" />
+<hkern u1="&#x4eb;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x4eb;" u2="&#x47f;" k="15" />
+<hkern u1="&#x4eb;" u2="&#x461;" k="16" />
+<hkern u1="&#x4eb;" u2="&#x442;" k="22" />
+<hkern u1="&#x4eb;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x4eb;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x4ed;" u2="&#x50f;" k="20" />
+<hkern u1="&#x4ed;" u2="&#x4a1;" k="20" />
+<hkern u1="&#x4ed;" u2="&#x442;" k="21" />
+<hkern u1="&#x4ed;" u2="&#x434;" k="18" />
+<hkern u1="&#x4ed;" u2="&#x3c7;" k="24" />
+<hkern u1="&#x4ed;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x4ee;" u2="&#x50e;" k="-17" />
+<hkern u1="&#x4ee;" u2="&#x50b;" k="33" />
+<hkern u1="&#x4ee;" u2="&#x500;" k="67" />
+<hkern u1="&#x4ee;" u2="&#x4bd;" k="38" />
+<hkern u1="&#x4ee;" u2="&#x4bb;" k="34" />
+<hkern u1="&#x4ee;" u2="&#x4b9;" k="23" />
+<hkern u1="&#x4ee;" u2="&#x4a7;" k="32" />
+<hkern u1="&#x4ee;" u2="&#x49d;" k="32" />
+<hkern u1="&#x4ee;" u2="&#x491;" k="30" />
+<hkern u1="&#x4ee;" u2="&#x48f;" k="35" />
+<hkern u1="&#x4ee;" u2="&#x47b;" k="50" />
+<hkern u1="&#x4ee;" u2="&#x45f;" k="32" />
+<hkern u1="&#x4ee;" u2="&#x44f;" k="46" />
+<hkern u1="&#x4ee;" u2="&#x44b;" k="33" />
+<hkern u1="&#x4ee;" u2="&#x437;" k="42" />
+<hkern u1="&#x4ee;" u2="&#x434;" k="83" />
+<hkern u1="&#x4ee;" u2="&#x432;" k="32" />
+<hkern u1="&#x4ee;" u2="&#x42c;" k="-18" />
+<hkern u1="&#x4ee;" u2="&#x414;" k="82" />
+<hkern u1="&#x4ef;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4ef;" u2="&#x434;" k="56" />
+<hkern u1="&#x4ef;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x4ef;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x4ef;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x4ef;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x4ef;" u2="f" k="-13" />
+<hkern u1="&#x4f0;" u2="&#x50e;" k="-17" />
+<hkern u1="&#x4f0;" u2="&#x50b;" k="33" />
+<hkern u1="&#x4f0;" u2="&#x500;" k="67" />
+<hkern u1="&#x4f0;" u2="&#x4bd;" k="38" />
+<hkern u1="&#x4f0;" u2="&#x4bb;" k="34" />
+<hkern u1="&#x4f0;" u2="&#x4b9;" k="23" />
+<hkern u1="&#x4f0;" u2="&#x4a7;" k="32" />
+<hkern u1="&#x4f0;" u2="&#x49d;" k="32" />
+<hkern u1="&#x4f0;" u2="&#x491;" k="30" />
+<hkern u1="&#x4f0;" u2="&#x48f;" k="35" />
+<hkern u1="&#x4f0;" u2="&#x47b;" k="50" />
+<hkern u1="&#x4f0;" u2="&#x45f;" k="32" />
+<hkern u1="&#x4f0;" u2="&#x44f;" k="46" />
+<hkern u1="&#x4f0;" u2="&#x44b;" k="33" />
+<hkern u1="&#x4f0;" u2="&#x437;" k="42" />
+<hkern u1="&#x4f0;" u2="&#x434;" k="83" />
+<hkern u1="&#x4f0;" u2="&#x432;" k="32" />
+<hkern u1="&#x4f0;" u2="&#x42c;" k="-18" />
+<hkern u1="&#x4f0;" u2="&#x414;" k="82" />
+<hkern u1="&#x4f1;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4f1;" u2="&#x434;" k="56" />
+<hkern u1="&#x4f1;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x4f1;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x4f1;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x4f1;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x4f1;" u2="f" k="-13" />
+<hkern u1="&#x4f2;" u2="&#x50e;" k="-17" />
+<hkern u1="&#x4f2;" u2="&#x50b;" k="33" />
+<hkern u1="&#x4f2;" u2="&#x500;" k="67" />
+<hkern u1="&#x4f2;" u2="&#x4bd;" k="38" />
+<hkern u1="&#x4f2;" u2="&#x4bb;" k="34" />
+<hkern u1="&#x4f2;" u2="&#x4b9;" k="23" />
+<hkern u1="&#x4f2;" u2="&#x4a7;" k="32" />
+<hkern u1="&#x4f2;" u2="&#x49d;" k="32" />
+<hkern u1="&#x4f2;" u2="&#x491;" k="30" />
+<hkern u1="&#x4f2;" u2="&#x48f;" k="35" />
+<hkern u1="&#x4f2;" u2="&#x47b;" k="50" />
+<hkern u1="&#x4f2;" u2="&#x45f;" k="32" />
+<hkern u1="&#x4f2;" u2="&#x44f;" k="46" />
+<hkern u1="&#x4f2;" u2="&#x44b;" k="33" />
+<hkern u1="&#x4f2;" u2="&#x437;" k="42" />
+<hkern u1="&#x4f2;" u2="&#x434;" k="83" />
+<hkern u1="&#x4f2;" u2="&#x432;" k="32" />
+<hkern u1="&#x4f2;" u2="&#x42c;" k="-18" />
+<hkern u1="&#x4f2;" u2="&#x414;" k="82" />
+<hkern u1="&#x4f3;" u2="&#x47b;" k="15" />
+<hkern u1="&#x4f3;" u2="&#x434;" k="56" />
+<hkern u1="&#x4f3;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x4f3;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x4f3;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x4f3;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x4f3;" u2="f" k="-13" />
+<hkern u1="&#x4f6;" u2="&#x510;" k="43" />
+<hkern u1="&#x4f6;" u2="&#x50f;" k="208" />
+<hkern u1="&#x4f6;" u2="&#x50e;" k="-5" />
+<hkern u1="&#x4f6;" u2="&#x50b;" k="246" />
+<hkern u1="&#x4f6;" u2="&#x507;" k="161" />
+<hkern u1="&#x4f6;" u2="&#x505;" k="207" />
+<hkern u1="&#x4f6;" u2="&#x500;" k="273" />
+<hkern u1="&#x4f6;" u2="&#x4d8;" k="64" />
+<hkern u1="&#x4f6;" u2="&#x4bd;" k="271" />
+<hkern u1="&#x4f6;" u2="&#x4bc;" k="193" />
+<hkern u1="&#x4f6;" u2="&#x4bb;" k="244" />
+<hkern u1="&#x4f6;" u2="&#x4b9;" k="244" />
+<hkern u1="&#x4f6;" u2="&#x4a7;" k="183" />
+<hkern u1="&#x4f6;" u2="&#x4a1;" k="150" />
+<hkern u1="&#x4f6;" u2="&#x49d;" k="242" />
+<hkern u1="&#x4f6;" u2="&#x491;" k="196" />
+<hkern u1="&#x4f6;" u2="&#x48f;" k="235" />
+<hkern u1="&#x4f6;" u2="&#x47f;" k="84" />
+<hkern u1="&#x4f6;" u2="&#x47b;" k="279" />
+<hkern u1="&#x4f6;" u2="&#x461;" k="239" />
+<hkern u1="&#x4f6;" u2="&#x45f;" k="242" />
+<hkern u1="&#x4f6;" u2="&#x44f;" k="249" />
+<hkern u1="&#x4f6;" u2="&#x44d;" k="237" />
+<hkern u1="&#x4f6;" u2="&#x44b;" k="242" />
+<hkern u1="&#x4f6;" u2="&#x442;" k="152" />
+<hkern u1="&#x4f6;" u2="&#x437;" k="237" />
+<hkern u1="&#x4f6;" u2="&#x434;" k="258" />
+<hkern u1="&#x4f6;" u2="&#x432;" k="183" />
+<hkern u1="&#x4f6;" u2="&#x431;" k="67" />
+<hkern u1="&#x4f6;" u2="&#x42c;" k="-5" />
+<hkern u1="&#x4f6;" u2="&#x414;" k="157" />
+<hkern u1="&#x4f6;" u2="&#x3c9;" k="245" />
+<hkern u1="&#x4f6;" u2="&#x3c8;" k="242" />
+<hkern u1="&#x4f6;" u2="&#x3c7;" k="150" />
+<hkern u1="&#x4f6;" u2="&#x3c6;" k="241" />
+<hkern u1="&#x4f6;" u2="&#x3c4;" k="152" />
+<hkern u1="&#x4f6;" u2="&#x3c1;" k="249" />
+<hkern u1="&#x4f6;" u2="&#x3c0;" k="191" />
+<hkern u1="&#x4f6;" u2="&#x3b9;" k="246" />
+<hkern u1="&#x4f6;" u2="&#x3b5;" k="241" />
+<hkern u1="&#x4f6;" u2="&#x3b4;" k="46" />
+<hkern u1="&#x4f6;" u2="&#x3a6;" k="142" />
+<hkern u1="&#x4f6;" u2="&#xf8;" k="181" />
+<hkern u1="&#x4f6;" u2="&#xe6;" k="163" />
+<hkern u1="&#x4f6;" u2="&#xc6;" k="340" />
+<hkern u1="&#x4f6;" u2="&#xbb;" k="270" />
+<hkern u1="&#x4f6;" u2="&#xab;" k="277" />
+<hkern u1="&#x4f6;" u2="w" k="99" />
+<hkern u1="&#x4f6;" u2="r" k="130" />
+<hkern u1="&#x4f7;" u2="&#x47b;" k="18" />
+<hkern u1="&#x4f7;" u2="&#x434;" k="55" />
+<hkern u1="&#x4fb;" u2="&#x47b;" k="18" />
+<hkern u1="&#x4fb;" u2="&#x434;" k="55" />
+<hkern u1="&#x4fc;" g2="Q.smcp" k="23" />
+<hkern u1="&#x4fc;" u2="&#x510;" k="14" />
+<hkern u1="&#x4fc;" u2="&#x50f;" k="42" />
+<hkern u1="&#x4fc;" u2="&#x506;" k="-12" />
+<hkern u1="&#x4fc;" u2="&#x504;" k="-13" />
+<hkern u1="&#x4fc;" u2="&#x4d8;" k="25" />
+<hkern u1="&#x4fc;" u2="&#x4bd;" k="59" />
+<hkern u1="&#x4fc;" u2="&#x4bc;" k="42" />
+<hkern u1="&#x4fc;" u2="&#x4b9;" k="45" />
+<hkern u1="&#x4fc;" u2="&#x4a1;" k="41" />
+<hkern u1="&#x4fc;" u2="&#x442;" k="41" />
+<hkern u1="&#x4fc;" u2="&#x431;" k="23" />
+<hkern u1="&#x4fc;" u2="&#x414;" k="-18" />
+<hkern u1="&#x4fc;" u2="&#x3c9;" k="18" />
+<hkern u1="&#x4fc;" u2="&#x3c8;" k="27" />
+<hkern u1="&#x4fc;" u2="&#x3c6;" k="25" />
+<hkern u1="&#x4fc;" u2="&#x3c4;" k="32" />
+<hkern u1="&#x4fc;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x4fc;" u2="&#x3b8;" k="19" />
+<hkern u1="&#x4fc;" u2="&#x3b4;" k="16" />
+<hkern u1="&#x4fc;" u2="&#x3a6;" k="44" />
+<hkern u1="&#x4fd;" u2="&#x47b;" k="15" />
+<hkern u1="&#x1e00;" g2="T.smcp" k="57" />
+<hkern u1="&#x1e00;" g2="U.smcp" k="15" />
+<hkern u1="&#x1e00;" g2="V.smcp" k="51" />
+<hkern u1="&#x1e00;" g2="W.smcp" k="35" />
+<hkern u1="&#x1e00;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1e00;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1e00;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1e00;" u2="&#x506;" k="54" />
+<hkern u1="&#x1e00;" u2="&#x504;" k="80" />
+<hkern u1="&#x1e00;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1e00;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1e00;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1e00;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1e00;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1e00;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1e00;" u2="&#x442;" k="54" />
+<hkern u1="&#x1e00;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1e00;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1e00;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1e00;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1e00;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1e00;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1e00;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1e00;" u2="w" k="33" />
+<hkern u1="&#x1e00;" u2="t" k="17" />
+<hkern u1="&#x1e00;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1e01;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1e01;" u2="&#x507;" k="13" />
+<hkern u1="&#x1e01;" u2="&#x505;" k="13" />
+<hkern u1="&#x1e01;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1e01;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1e01;" u2="&#x461;" k="15" />
+<hkern u1="&#x1e01;" u2="&#x442;" k="16" />
+<hkern u1="&#x1e3e;" u2="&#x50e;" k="28" />
+<hkern u1="&#x1e3e;" u2="&#x506;" k="30" />
+<hkern u1="&#x1e3e;" u2="&#x504;" k="29" />
+<hkern u1="&#x1e3e;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x1e3e;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x1e3e;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x1e3e;" u2="&#x434;" k="-21" />
+<hkern u1="&#x1e3e;" u2="&#x414;" k="-21" />
+<hkern u1="&#x1e80;" g2="Q.smcp" k="25" />
+<hkern u1="&#x1e80;" u2="&#x7d;" k="-14" />
+<hkern u1="&#x1e80;" u2="r" k="21" />
+<hkern u1="&#x1e80;" u2="]" k="-12" />
+<hkern u1="&#x1e80;" u2="&#x29;" k="-15" />
+<hkern u1="&#x1e82;" g2="Q.smcp" k="25" />
+<hkern u1="&#x1e82;" u2="&#x7d;" k="-14" />
+<hkern u1="&#x1e82;" u2="r" k="21" />
+<hkern u1="&#x1e82;" u2="]" k="-12" />
+<hkern u1="&#x1e82;" u2="&#x29;" k="-15" />
+<hkern u1="&#x1e84;" g2="Q.smcp" k="25" />
+<hkern u1="&#x1e84;" u2="&#x7d;" k="-14" />
+<hkern u1="&#x1e84;" u2="r" k="21" />
+<hkern u1="&#x1e84;" u2="]" k="-12" />
+<hkern u1="&#x1e84;" u2="&#x29;" k="-15" />
+<hkern u1="&#x1ea0;" g2="T.smcp" k="57" />
+<hkern u1="&#x1ea0;" g2="U.smcp" k="15" />
+<hkern u1="&#x1ea0;" g2="V.smcp" k="51" />
+<hkern u1="&#x1ea0;" g2="W.smcp" k="35" />
+<hkern u1="&#x1ea0;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1ea0;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1ea0;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1ea0;" u2="&#x506;" k="54" />
+<hkern u1="&#x1ea0;" u2="&#x504;" k="80" />
+<hkern u1="&#x1ea0;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1ea0;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1ea0;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1ea0;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1ea0;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1ea0;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1ea0;" u2="&#x442;" k="54" />
+<hkern u1="&#x1ea0;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1ea0;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1ea0;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1ea0;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1ea0;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1ea0;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1ea0;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1ea0;" u2="w" k="33" />
+<hkern u1="&#x1ea0;" u2="t" k="17" />
+<hkern u1="&#x1ea0;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ea1;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ea1;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ea1;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ea1;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ea1;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ea1;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ea1;" u2="&#x442;" k="16" />
+<hkern u1="&#x1ea2;" g2="T.smcp" k="57" />
+<hkern u1="&#x1ea2;" g2="U.smcp" k="15" />
+<hkern u1="&#x1ea2;" g2="V.smcp" k="51" />
+<hkern u1="&#x1ea2;" g2="W.smcp" k="35" />
+<hkern u1="&#x1ea2;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1ea2;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1ea2;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1ea2;" u2="&#x506;" k="54" />
+<hkern u1="&#x1ea2;" u2="&#x504;" k="80" />
+<hkern u1="&#x1ea2;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1ea2;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1ea2;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1ea2;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1ea2;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1ea2;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1ea2;" u2="&#x442;" k="54" />
+<hkern u1="&#x1ea2;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1ea2;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1ea2;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1ea2;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1ea2;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1ea2;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1ea2;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1ea2;" u2="w" k="33" />
+<hkern u1="&#x1ea2;" u2="t" k="17" />
+<hkern u1="&#x1ea2;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ea3;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ea3;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ea3;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ea3;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ea3;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ea3;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ea3;" u2="&#x442;" k="16" />
+<hkern u1="&#x1ea4;" g2="T.smcp" k="57" />
+<hkern u1="&#x1ea4;" g2="U.smcp" k="15" />
+<hkern u1="&#x1ea4;" g2="V.smcp" k="51" />
+<hkern u1="&#x1ea4;" g2="W.smcp" k="35" />
+<hkern u1="&#x1ea4;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1ea4;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1ea4;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1ea4;" u2="&#x506;" k="54" />
+<hkern u1="&#x1ea4;" u2="&#x504;" k="80" />
+<hkern u1="&#x1ea4;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1ea4;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1ea4;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1ea4;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1ea4;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1ea4;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1ea4;" u2="&#x442;" k="54" />
+<hkern u1="&#x1ea4;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1ea4;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1ea4;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1ea4;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1ea4;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1ea4;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1ea4;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1ea4;" u2="w" k="33" />
+<hkern u1="&#x1ea4;" u2="t" k="17" />
+<hkern u1="&#x1ea4;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ea5;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ea5;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ea5;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ea5;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ea5;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ea5;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ea5;" u2="&#x442;" k="16" />
+<hkern u1="&#x1ea6;" g2="T.smcp" k="57" />
+<hkern u1="&#x1ea6;" g2="U.smcp" k="15" />
+<hkern u1="&#x1ea6;" g2="V.smcp" k="51" />
+<hkern u1="&#x1ea6;" g2="W.smcp" k="35" />
+<hkern u1="&#x1ea6;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1ea6;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1ea6;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1ea6;" u2="&#x506;" k="54" />
+<hkern u1="&#x1ea6;" u2="&#x504;" k="80" />
+<hkern u1="&#x1ea6;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1ea6;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1ea6;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1ea6;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1ea6;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1ea6;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1ea6;" u2="&#x442;" k="54" />
+<hkern u1="&#x1ea6;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1ea6;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1ea6;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1ea6;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1ea6;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1ea6;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1ea6;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1ea6;" u2="w" k="33" />
+<hkern u1="&#x1ea6;" u2="t" k="17" />
+<hkern u1="&#x1ea6;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ea7;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ea7;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ea7;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ea7;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ea7;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ea7;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ea7;" u2="&#x442;" k="16" />
+<hkern u1="&#x1ea8;" g2="T.smcp" k="57" />
+<hkern u1="&#x1ea8;" g2="U.smcp" k="15" />
+<hkern u1="&#x1ea8;" g2="V.smcp" k="51" />
+<hkern u1="&#x1ea8;" g2="W.smcp" k="35" />
+<hkern u1="&#x1ea8;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1ea8;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1ea8;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1ea8;" u2="&#x506;" k="54" />
+<hkern u1="&#x1ea8;" u2="&#x504;" k="80" />
+<hkern u1="&#x1ea8;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1ea8;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1ea8;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1ea8;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1ea8;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1ea8;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1ea8;" u2="&#x442;" k="54" />
+<hkern u1="&#x1ea8;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1ea8;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1ea8;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1ea8;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1ea8;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1ea8;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1ea8;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1ea8;" u2="w" k="33" />
+<hkern u1="&#x1ea8;" u2="t" k="17" />
+<hkern u1="&#x1ea8;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ea9;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ea9;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ea9;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ea9;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ea9;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ea9;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ea9;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eaa;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eaa;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eaa;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eaa;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eaa;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eaa;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eaa;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eaa;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eaa;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eaa;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eaa;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eaa;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eaa;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eaa;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eaa;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eaa;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eaa;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eaa;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eaa;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eaa;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eaa;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eaa;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eaa;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eaa;" u2="w" k="33" />
+<hkern u1="&#x1eaa;" u2="t" k="17" />
+<hkern u1="&#x1eaa;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eab;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eab;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eab;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eab;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eab;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eab;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eab;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eac;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eac;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eac;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eac;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eac;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eac;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eac;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eac;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eac;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eac;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eac;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eac;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eac;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eac;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eac;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eac;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eac;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eac;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eac;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eac;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eac;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eac;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eac;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eac;" u2="w" k="33" />
+<hkern u1="&#x1eac;" u2="t" k="17" />
+<hkern u1="&#x1eac;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1ead;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1ead;" u2="&#x507;" k="13" />
+<hkern u1="&#x1ead;" u2="&#x505;" k="13" />
+<hkern u1="&#x1ead;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1ead;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1ead;" u2="&#x461;" k="15" />
+<hkern u1="&#x1ead;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eae;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eae;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eae;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eae;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eae;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eae;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eae;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eae;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eae;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eae;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eae;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eae;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eae;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eae;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eae;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eae;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eae;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eae;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eae;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eae;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eae;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eae;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eae;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eae;" u2="w" k="33" />
+<hkern u1="&#x1eae;" u2="t" k="17" />
+<hkern u1="&#x1eae;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eaf;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eaf;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eaf;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eaf;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eaf;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eaf;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eaf;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eb0;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eb0;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eb0;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eb0;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eb0;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eb0;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eb0;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eb0;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eb0;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eb0;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eb0;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eb0;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eb0;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eb0;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eb0;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eb0;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eb0;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eb0;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eb0;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eb0;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eb0;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eb0;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eb0;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eb0;" u2="w" k="33" />
+<hkern u1="&#x1eb0;" u2="t" k="17" />
+<hkern u1="&#x1eb0;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eb1;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eb1;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eb1;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eb1;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eb1;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eb1;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eb1;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eb2;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eb2;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eb2;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eb2;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eb2;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eb2;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eb2;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eb2;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eb2;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eb2;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eb2;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eb2;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eb2;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eb2;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eb2;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eb2;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eb2;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eb2;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eb2;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eb2;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eb2;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eb2;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eb2;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eb2;" u2="w" k="33" />
+<hkern u1="&#x1eb2;" u2="t" k="17" />
+<hkern u1="&#x1eb2;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eb3;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eb3;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eb3;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eb3;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eb3;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eb3;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eb3;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eb4;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eb4;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eb4;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eb4;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eb4;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eb4;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eb4;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eb4;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eb4;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eb4;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eb4;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eb4;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eb4;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eb4;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eb4;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eb4;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eb4;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eb4;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eb4;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eb4;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eb4;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eb4;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eb4;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eb4;" u2="w" k="33" />
+<hkern u1="&#x1eb4;" u2="t" k="17" />
+<hkern u1="&#x1eb4;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eb5;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eb5;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eb5;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eb5;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eb5;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eb5;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eb5;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eb6;" g2="T.smcp" k="57" />
+<hkern u1="&#x1eb6;" g2="U.smcp" k="15" />
+<hkern u1="&#x1eb6;" g2="V.smcp" k="51" />
+<hkern u1="&#x1eb6;" g2="W.smcp" k="35" />
+<hkern u1="&#x1eb6;" g2="Y.smcp" k="60" />
+<hkern u1="&#x1eb6;" u2="&#x50f;" k="57" />
+<hkern u1="&#x1eb6;" u2="&#x50e;" k="88" />
+<hkern u1="&#x1eb6;" u2="&#x506;" k="54" />
+<hkern u1="&#x1eb6;" u2="&#x504;" k="80" />
+<hkern u1="&#x1eb6;" u2="&#x4d8;" k="14" />
+<hkern u1="&#x1eb6;" u2="&#x4bd;" k="35" />
+<hkern u1="&#x1eb6;" u2="&#x4bc;" k="152" />
+<hkern u1="&#x1eb6;" u2="&#x4b9;" k="123" />
+<hkern u1="&#x1eb6;" u2="&#x4b8;" k="155" />
+<hkern u1="&#x1eb6;" u2="&#x4a1;" k="126" />
+<hkern u1="&#x1eb6;" u2="&#x442;" k="54" />
+<hkern u1="&#x1eb6;" u2="&#x42c;" k="59" />
+<hkern u1="&#x1eb6;" u2="&#x414;" k="-19" />
+<hkern u1="&#x1eb6;" u2="&#x3c4;" k="56" />
+<hkern u1="&#x1eb6;" u2="&#x3bb;" k="-17" />
+<hkern u1="&#x1eb6;" u2="&#x3a8;" k="47" />
+<hkern u1="&#x1eb6;" u2="&#x3a6;" k="27" />
+<hkern u1="&#x1eb6;" u2="&#x1af;" k="18" />
+<hkern u1="&#x1eb6;" u2="w" k="33" />
+<hkern u1="&#x1eb6;" u2="t" k="17" />
+<hkern u1="&#x1eb6;" u2="&#x3f;" k="80" />
+<hkern u1="&#x1eb7;" u2="&#x50f;" k="15" />
+<hkern u1="&#x1eb7;" u2="&#x507;" k="13" />
+<hkern u1="&#x1eb7;" u2="&#x505;" k="13" />
+<hkern u1="&#x1eb7;" u2="&#x4a1;" k="15" />
+<hkern u1="&#x1eb7;" u2="&#x47f;" k="13" />
+<hkern u1="&#x1eb7;" u2="&#x461;" k="15" />
+<hkern u1="&#x1eb7;" u2="&#x442;" k="16" />
+<hkern u1="&#x1eb8;" g2="V.smcp" k="16" />
+<hkern u1="&#x1eb8;" g2="W.smcp" k="19" />
+<hkern u1="&#x1eb8;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1eb8;" u2="w" k="22" />
+<hkern u1="&#x1eb8;" u2="f" k="18" />
+<hkern u1="&#x1eb9;" u2="&#x442;" k="11" />
+<hkern u1="&#x1eba;" g2="V.smcp" k="16" />
+<hkern u1="&#x1eba;" g2="W.smcp" k="19" />
+<hkern u1="&#x1eba;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1eba;" u2="w" k="22" />
+<hkern u1="&#x1eba;" u2="f" k="18" />
+<hkern u1="&#x1ebb;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ebc;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ebc;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ebc;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ebc;" u2="w" k="22" />
+<hkern u1="&#x1ebc;" u2="f" k="18" />
+<hkern u1="&#x1ebd;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ebe;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ebe;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ebe;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ebe;" u2="w" k="22" />
+<hkern u1="&#x1ebe;" u2="f" k="18" />
+<hkern u1="&#x1ebf;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ec0;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ec0;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ec0;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ec0;" u2="w" k="22" />
+<hkern u1="&#x1ec0;" u2="f" k="18" />
+<hkern u1="&#x1ec1;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ec2;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ec2;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ec2;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ec2;" u2="w" k="22" />
+<hkern u1="&#x1ec2;" u2="f" k="18" />
+<hkern u1="&#x1ec3;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ec4;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ec4;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ec4;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ec4;" u2="w" k="22" />
+<hkern u1="&#x1ec4;" u2="f" k="18" />
+<hkern u1="&#x1ec5;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ec6;" g2="V.smcp" k="16" />
+<hkern u1="&#x1ec6;" g2="W.smcp" k="19" />
+<hkern u1="&#x1ec6;" g2="Y.smcp" k="16" />
+<hkern u1="&#x1ec6;" u2="w" k="22" />
+<hkern u1="&#x1ec6;" u2="f" k="18" />
+<hkern u1="&#x1ec7;" u2="&#x442;" k="11" />
+<hkern u1="&#x1ec8;" u2="&#x50e;" k="28" />
+<hkern u1="&#x1ec8;" u2="&#x506;" k="30" />
+<hkern u1="&#x1ec8;" u2="&#x504;" k="29" />
+<hkern u1="&#x1ec8;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x1ec8;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x1ec8;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x1ec8;" u2="&#x434;" k="-21" />
+<hkern u1="&#x1ec8;" u2="&#x414;" k="-21" />
+<hkern u1="&#x1eca;" u2="&#x50e;" k="28" />
+<hkern u1="&#x1eca;" u2="&#x506;" k="30" />
+<hkern u1="&#x1eca;" u2="&#x504;" k="29" />
+<hkern u1="&#x1eca;" u2="&#x4bc;" k="28" />
+<hkern u1="&#x1eca;" u2="&#x4b9;" k="27" />
+<hkern u1="&#x1eca;" u2="&#x4b8;" k="28" />
+<hkern u1="&#x1eca;" u2="&#x434;" k="-21" />
+<hkern u1="&#x1eca;" u2="&#x414;" k="-21" />
+<hkern u1="&#x1ecc;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ecc;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ecc;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ecc;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ecc;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ecc;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ecc;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ecc;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ecd;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ecd;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ecd;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ecd;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ecd;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ecd;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ecd;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ecd;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ece;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ece;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ece;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ece;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ece;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ece;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ece;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ece;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ecf;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ecf;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ecf;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ecf;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ecf;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ecf;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ecf;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ecf;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ed0;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ed0;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ed0;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ed0;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ed0;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ed0;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ed0;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ed0;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ed1;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ed1;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ed1;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ed1;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ed1;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ed1;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ed1;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ed1;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ed2;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ed2;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ed2;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ed2;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ed2;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ed2;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ed2;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ed2;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ed3;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ed3;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ed3;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ed3;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ed3;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ed3;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ed3;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ed3;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ed4;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ed4;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ed4;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ed4;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ed4;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ed4;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ed4;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ed4;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ed5;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ed5;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ed5;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ed5;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ed5;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ed5;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ed5;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ed5;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ed6;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ed6;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ed6;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ed6;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ed6;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ed6;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ed6;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ed6;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ed7;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ed7;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ed7;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ed7;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ed7;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ed7;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ed7;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ed7;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ed8;" g2="X.smcp" k="11" />
+<hkern u1="&#x1ed8;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1ed8;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1ed8;" u2="&#x414;" k="33" />
+<hkern u1="&#x1ed8;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1ed8;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1ed8;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1ed8;" u2="&#xc6;" k="33" />
+<hkern u1="&#x1ed9;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ed9;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ed9;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ed9;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ed9;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ed9;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ed9;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ed9;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ee1;" u2="&#x50f;" k="20" />
+<hkern u1="&#x1ee1;" u2="&#x505;" k="11" />
+<hkern u1="&#x1ee1;" u2="&#x4a1;" k="21" />
+<hkern u1="&#x1ee1;" u2="&#x47f;" k="15" />
+<hkern u1="&#x1ee1;" u2="&#x461;" k="16" />
+<hkern u1="&#x1ee1;" u2="&#x442;" k="22" />
+<hkern u1="&#x1ee1;" u2="&#x3c7;" k="22" />
+<hkern u1="&#x1ee1;" u2="&#x3c4;" k="22" />
+<hkern u1="&#x1ef2;" g2="Q.smcp" k="53" />
+<hkern u1="&#x1ef2;" g2="T.smcp" k="13" />
+<hkern u1="&#x1ef2;" g2="W.smcp" k="13" />
+<hkern u1="&#x1ef2;" g2="X.smcp" k="17" />
+<hkern u1="&#x1ef2;" u2="&#x2022;" k="45" />
+<hkern u1="&#x1ef2;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x1ef2;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x1ef2;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x1ef2;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x1ef2;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x1ef2;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x1ef2;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x1ef2;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x1ef2;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x1ef2;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x1ef2;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x1ef2;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x1ef2;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x1ef2;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x1ef2;" u2="&#xf8;" k="64" />
+<hkern u1="&#x1ef2;" u2="&#xe6;" k="63" />
+<hkern u1="&#x1ef2;" u2="&#xc6;" k="96" />
+<hkern u1="&#x1ef2;" u2="&#xbb;" k="51" />
+<hkern u1="&#x1ef2;" u2="&#xab;" k="82" />
+<hkern u1="&#x1ef2;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x1ef2;" u2="t" k="22" />
+<hkern u1="&#x1ef2;" u2="r" k="40" />
+<hkern u1="&#x1ef2;" u2="f" k="22" />
+<hkern u1="&#x1ef2;" u2="]" k="-18" />
+<hkern u1="&#x1ef2;" u2="&#x2a;" k="49" />
+<hkern u1="&#x1ef2;" u2="&#x29;" k="-20" />
+<hkern u1="&#x1ef2;" u2="&#x26;" k="30" />
+<hkern u1="&#x1ef3;" u2="&#x47b;" k="15" />
+<hkern u1="&#x1ef3;" u2="&#x434;" k="56" />
+<hkern u1="&#x1ef3;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x1ef3;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x1ef3;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x1ef3;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x1ef3;" u2="f" k="-13" />
+<hkern u1="&#x1ef4;" g2="Q.smcp" k="53" />
+<hkern u1="&#x1ef4;" g2="T.smcp" k="13" />
+<hkern u1="&#x1ef4;" g2="W.smcp" k="13" />
+<hkern u1="&#x1ef4;" g2="X.smcp" k="17" />
+<hkern u1="&#x1ef4;" u2="&#x2022;" k="45" />
+<hkern u1="&#x1ef4;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x1ef4;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x1ef4;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x1ef4;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x1ef4;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x1ef4;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x1ef4;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x1ef4;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x1ef4;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x1ef4;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x1ef4;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x1ef4;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x1ef4;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x1ef4;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x1ef4;" u2="&#xf8;" k="64" />
+<hkern u1="&#x1ef4;" u2="&#xe6;" k="63" />
+<hkern u1="&#x1ef4;" u2="&#xc6;" k="96" />
+<hkern u1="&#x1ef4;" u2="&#xbb;" k="51" />
+<hkern u1="&#x1ef4;" u2="&#xab;" k="82" />
+<hkern u1="&#x1ef4;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x1ef4;" u2="t" k="22" />
+<hkern u1="&#x1ef4;" u2="r" k="40" />
+<hkern u1="&#x1ef4;" u2="f" k="22" />
+<hkern u1="&#x1ef4;" u2="]" k="-18" />
+<hkern u1="&#x1ef4;" u2="&#x2a;" k="49" />
+<hkern u1="&#x1ef4;" u2="&#x29;" k="-20" />
+<hkern u1="&#x1ef4;" u2="&#x26;" k="30" />
+<hkern u1="&#x1ef5;" u2="&#x47b;" k="15" />
+<hkern u1="&#x1ef5;" u2="&#x434;" k="56" />
+<hkern u1="&#x1ef5;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x1ef5;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x1ef5;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x1ef5;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x1ef5;" u2="f" k="-13" />
+<hkern u1="&#x1ef6;" g2="Q.smcp" k="53" />
+<hkern u1="&#x1ef6;" g2="T.smcp" k="13" />
+<hkern u1="&#x1ef6;" g2="W.smcp" k="13" />
+<hkern u1="&#x1ef6;" g2="X.smcp" k="17" />
+<hkern u1="&#x1ef6;" u2="&#x2022;" k="45" />
+<hkern u1="&#x1ef6;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x1ef6;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x1ef6;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x1ef6;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x1ef6;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x1ef6;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x1ef6;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x1ef6;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x1ef6;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x1ef6;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x1ef6;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x1ef6;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x1ef6;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x1ef6;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x1ef6;" u2="&#xf8;" k="64" />
+<hkern u1="&#x1ef6;" u2="&#xe6;" k="63" />
+<hkern u1="&#x1ef6;" u2="&#xc6;" k="96" />
+<hkern u1="&#x1ef6;" u2="&#xbb;" k="51" />
+<hkern u1="&#x1ef6;" u2="&#xab;" k="82" />
+<hkern u1="&#x1ef6;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x1ef6;" u2="t" k="22" />
+<hkern u1="&#x1ef6;" u2="r" k="40" />
+<hkern u1="&#x1ef6;" u2="f" k="22" />
+<hkern u1="&#x1ef6;" u2="]" k="-18" />
+<hkern u1="&#x1ef6;" u2="&#x2a;" k="49" />
+<hkern u1="&#x1ef6;" u2="&#x29;" k="-20" />
+<hkern u1="&#x1ef6;" u2="&#x26;" k="30" />
+<hkern u1="&#x1ef7;" u2="&#x47b;" k="15" />
+<hkern u1="&#x1ef7;" u2="&#x434;" k="56" />
+<hkern u1="&#x1ef7;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x1ef7;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x1ef7;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x1ef7;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x1ef7;" u2="f" k="-13" />
+<hkern u1="&#x1ef8;" g2="Q.smcp" k="53" />
+<hkern u1="&#x1ef8;" g2="T.smcp" k="13" />
+<hkern u1="&#x1ef8;" g2="W.smcp" k="13" />
+<hkern u1="&#x1ef8;" g2="X.smcp" k="17" />
+<hkern u1="&#x1ef8;" u2="&#x2022;" k="45" />
+<hkern u1="&#x1ef8;" u2="&#x3c9;" k="57" />
+<hkern u1="&#x1ef8;" u2="&#x3c8;" k="38" />
+<hkern u1="&#x1ef8;" u2="&#x3c7;" k="63" />
+<hkern u1="&#x1ef8;" u2="&#x3c6;" k="53" />
+<hkern u1="&#x1ef8;" u2="&#x3c4;" k="23" />
+<hkern u1="&#x1ef8;" u2="&#x3c1;" k="70" />
+<hkern u1="&#x1ef8;" u2="&#x3c0;" k="24" />
+<hkern u1="&#x1ef8;" u2="&#x3b9;" k="42" />
+<hkern u1="&#x1ef8;" u2="&#x3b8;" k="23" />
+<hkern u1="&#x1ef8;" u2="&#x3b6;" k="-13" />
+<hkern u1="&#x1ef8;" u2="&#x3b5;" k="58" />
+<hkern u1="&#x1ef8;" u2="&#x3b4;" k="18" />
+<hkern u1="&#x1ef8;" u2="&#x3b2;" k="22" />
+<hkern u1="&#x1ef8;" u2="&#x3a6;" k="48" />
+<hkern u1="&#x1ef8;" u2="&#xf8;" k="64" />
+<hkern u1="&#x1ef8;" u2="&#xe6;" k="63" />
+<hkern u1="&#x1ef8;" u2="&#xc6;" k="96" />
+<hkern u1="&#x1ef8;" u2="&#xbb;" k="51" />
+<hkern u1="&#x1ef8;" u2="&#xab;" k="82" />
+<hkern u1="&#x1ef8;" u2="&#x7d;" k="-19" />
+<hkern u1="&#x1ef8;" u2="t" k="22" />
+<hkern u1="&#x1ef8;" u2="r" k="40" />
+<hkern u1="&#x1ef8;" u2="f" k="22" />
+<hkern u1="&#x1ef8;" u2="]" k="-18" />
+<hkern u1="&#x1ef8;" u2="&#x2a;" k="49" />
+<hkern u1="&#x1ef8;" u2="&#x29;" k="-20" />
+<hkern u1="&#x1ef8;" u2="&#x26;" k="30" />
+<hkern u1="&#x1ef9;" u2="&#x47b;" k="15" />
+<hkern u1="&#x1ef9;" u2="&#x434;" k="56" />
+<hkern u1="&#x1ef9;" u2="&#x3c4;" k="-12" />
+<hkern u1="&#x1ef9;" u2="&#x3c1;" k="22" />
+<hkern u1="&#x1ef9;" u2="&#x3c0;" k="-11" />
+<hkern u1="&#x1ef9;" u2="&#x3b4;" k="11" />
+<hkern u1="&#x1ef9;" u2="f" k="-13" />
+<hkern u1="&#x1f4d;" g2="X.smcp" k="11" />
+<hkern u1="&#x1f4d;" u2="&#x50e;" k="32" />
+<hkern u1="&#x1f4d;" u2="&#x42c;" k="32" />
+<hkern u1="&#x1f4d;" u2="&#x414;" k="33" />
+<hkern u1="&#x1f4d;" u2="&#x3bb;" k="22" />
+<hkern u1="&#x1f4d;" u2="&#x3a3;" k="16" />
+<hkern u1="&#x1f4d;" u2="&#x39e;" k="13" />
+<hkern u1="&#x1f4d;" u2="&#xc6;" k="33" />
+<hkern u1="&#x2018;" u2="w" k="-11" />
+<hkern u1="&#x2019;" u2="w" k="-11" />
+<hkern u1="&#x201b;" u2="w" k="-11" />
+<hkern u1="&#x201c;" u2="w" k="-11" />
+<hkern u1="&#x201d;" u2="w" k="-11" />
+<hkern u1="&#x2032;" u2="w" k="-11" />
+<hkern u1="&#x2033;" u2="w" k="-11" />
+<hkern g1="Z.smcp" g2="Q.smcp" k="16" />
+<hkern g1="Y.smcp" g2="Q.smcp" k="21" />
+<hkern g1="Y.smcp" g2="T.smcp" k="-15" />
+<hkern g1="Y.smcp" g2="V.smcp" k="-16" />
+<hkern g1="Y.smcp" g2="W.smcp" k="-13" />
+<hkern g1="Y.smcp" g2="Y.smcp" k="-16" />
+<hkern g1="X.smcp" g2="Q.smcp" k="21" />
+<hkern g1="W.smcp" g2="T.smcp" k="-14" />
+<hkern g1="V.smcp" g2="Q.smcp" k="16" />
+<hkern g1="T.smcp" g2="Q.smcp" k="20" />
+<hkern g1="T.smcp" g2="S.smcp" k="11" />
+<hkern g1="T.smcp" g2="T.smcp" k="-14" />
+<hkern g1="T.smcp" g2="V.smcp" k="-13" />
+<hkern g1="T.smcp" g2="Y.smcp" k="-13" />
+<hkern g1="R.smcp" g2="T.smcp" k="14" />
+<hkern g1="R.smcp" g2="V.smcp" k="15" />
+<hkern g1="R.smcp" g2="W.smcp" k="11" />
+<hkern g1="R.smcp" g2="Y.smcp" k="18" />
+<hkern g1="Q.smcp" g2="T.smcp" k="23" />
+<hkern g1="Q.smcp" g2="V.smcp" k="21" />
+<hkern g1="Q.smcp" g2="W.smcp" k="15" />
+<hkern g1="Q.smcp" g2="Y.smcp" k="27" />
+<hkern g1="O.smcp" g2="T.smcp" k="18" />
+<hkern g1="O.smcp" g2="V.smcp" k="15" />
+<hkern g1="O.smcp" g2="X.smcp" k="20" />
+<hkern g1="O.smcp" g2="Y.smcp" k="22" />
+<hkern g1="L.smcp" g2="Q.smcp" k="16" />
+<hkern g1="L.smcp" g2="T.smcp" k="69" />
+<hkern g1="L.smcp" g2="U.smcp" k="20" />
+<hkern g1="L.smcp" g2="V.smcp" k="73" />
+<hkern g1="L.smcp" g2="W.smcp" k="43" />
+<hkern g1="L.smcp" g2="Y.smcp" k="76" />
+<hkern g1="K.smcp" g2="Q.smcp" k="21" />
+<hkern g1="D.smcp" g2="V.smcp" k="18" />
+<hkern g1="D.smcp" g2="W.smcp" k="11" />
+<hkern g1="A.smcp" g2="Q.smcp" k="14" />
+<hkern g1="A.smcp" g2="T.smcp" k="64" />
+<hkern g1="A.smcp" g2="U.smcp" k="20" />
+<hkern g1="A.smcp" g2="V.smcp" k="57" />
+<hkern g1="A.smcp" g2="W.smcp" k="40" />
+<hkern g1="A.smcp" g2="Y.smcp" k="65" />
+<hkern g1="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="282" />
+<hkern g1="B,Beta,uni0412"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="27" />
+<hkern g1="B,Beta,uni0412"  g2="V,uni0474,uni0476"  k="24" />
+<hkern g1="B,Beta,uni0412"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="55" />
+<hkern g1="B,Beta,uni0412"  g2="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  k="13" />
+<hkern g1="C,Ccedilla,Cacute,Ccircumflex,uni010A,Ccaron,uni0421,uni04AA"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="29" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="21" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="27" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="V,uni0474,uni0476"  k="22" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="43" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="121" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  k="22" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="Z,Zacute,Zdotaccent,Zcaron,Zeta"  k="23" />
+<hkern g1="D,O,Eth,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Dcaron,Dcroat,Omacron,Obreve,Ohungarumlaut,Omicrontonos,Theta,Omicron,uni041E,uni04E6,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1F4D"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="31" />
+<hkern g1="E,Egrave,Eacute,Ecircumflex,Edieresis,Emacron,Ebreve,Edotaccent,Eogonek,Ecaron,Epsilontonos,Epsilon,uni0400,uni0401,uni0415,uni04D6,uni1EB8,uni1EBA,uni1EBC,uni1EBE,uni1EC0,uni1EC2,uni1EC4,uni1EC6"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="19" />
+<hkern g1="E,Egrave,Eacute,Ecircumflex,Edieresis,Emacron,Ebreve,Edotaccent,Eogonek,Ecaron,Epsilontonos,Epsilon,uni0400,uni0401,uni0415,uni04D6,uni1EB8,uni1EBA,uni1EBC,uni1EBE,uni1EC0,uni1EC2,uni1EC4,uni1EC6"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="19" />
+<hkern g1="E,Egrave,Eacute,Ecircumflex,Edieresis,Emacron,Ebreve,Edotaccent,Eogonek,Ecaron,Epsilontonos,Epsilon,uni0400,uni0401,uni0415,uni04D6,uni1EB8,uni1EBA,uni1EBC,uni1EBE,uni1EC0,uni1EC2,uni1EC4,uni1EC6"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-20" />
+<hkern g1="E,Egrave,Eacute,Ecircumflex,Edieresis,Emacron,Ebreve,Edotaccent,Eogonek,Ecaron,Epsilontonos,Epsilon,uni0400,uni0401,uni0415,uni04D6,uni1EB8,uni1EBA,uni1EBC,uni1EBE,uni1EC0,uni1EC2,uni1EC4,uni1EC6"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="17" />
+<hkern g1="E,Egrave,Eacute,Ecircumflex,Edieresis,Emacron,Ebreve,Edotaccent,Eogonek,Ecaron,Epsilontonos,Epsilon,uni0400,uni0401,uni0415,uni04D6,uni1EB8,uni1EBA,uni1EBC,uni1EBE,uni1EC0,uni1EC2,uni1EC4,uni1EC6"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="26" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="-18" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="29" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="28" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  k="-17" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="-17" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="uni0427,uni04B6,uni04CB,uni04F4"  k="28" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="uni043B,uni0459,uni04C6,uni0513"  k="-17" />
+<hkern g1="H,I,M,N,Igrave,Iacute,Icircumflex,Idieresis,Ntilde,Hcircumflex,Itilde,Imacron,Ibreve,Iogonek,Idotaccent,Nacute,Ncommaaccent,Ncaron,Etatonos,Iotatonos,Eta,Iota,Mu,Nu,Iotadieresis,uni0406,uni0407,uni040F,uni0418,uni041B,uni041C,uni041D,uni0426,uni0428,uni04A2,uni04C0,uni04C9,uni04CD,uni04CF,uni1E3E,uni1EC8,uni1ECA"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="27" />
+<hkern g1="J,U,Ugrave,Uacute,Ucircumflex,Udieresis,Jcircumflex,Utilde,Umacron,Ubreve,Uring,Uhungarumlaut,Uogonek,uni0408,uni1EE4,uni1EE6"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="22" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="26" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="27" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="23" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="40" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="93" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="162" />
+<hkern g1="K,Kcommaaccent,Kappa,uni040C,uni041A,uni049A,uni049C,uni049E,uni04A0"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="31" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="255" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="-19" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="206" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="V,uni0474,uni0476"  k="205" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="278" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="14" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="123" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="25" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="U,Ugrave,Uacute,Ucircumflex,Udieresis,Utilde,Umacron,Ubreve,Uring,Uhungarumlaut,Uogonek,uni1EE4,uni1EE6"  k="24" />
+<hkern g1="L,Lacute,Lcommaaccent,Lcaron,Ldot"  g2="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  k="93" />
+<hkern g1="P,Rho,uni0420"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="177" />
+<hkern g1="P,Rho,uni0420"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="11" />
+<hkern g1="P,Rho,uni0420"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="13" />
+<hkern g1="P,Rho,uni0420"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="13" />
+<hkern g1="P,Rho,uni0420"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="402" />
+<hkern g1="P,Rho,uni0420"  g2="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  k="50" />
+<hkern g1="P,Rho,uni0420"  g2="Z,Zacute,Zdotaccent,Zcaron,Zeta"  k="35" />
+<hkern g1="P,Rho,uni0420"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="143" />
+<hkern g1="P,Rho,uni0420"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="-15" />
+<hkern g1="P,Rho,uni0420"  g2="uni043B,uni0459,uni04C6,uni0513"  k="88" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="108" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="83" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="89" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="m,n,p,ntilde,nacute,ncommaaccent,ncaron,napostrophe,etatonos,eta,uni0433,uni0438,uni0439,uni043A,uni043C,uni043D,uni043F,uni0440,uni0446,uni0448,uni0449,uni044C,uni044E,uni0453,uni045A,uni045C,uni045D,uni048B,uni049B,uni04A3,uni04A5,uni04C8,uni04CA,uni04CE,uni04E3,uni04E5,uni04F7,uni04F9,uni04FB,uni1E3F"  k="89" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="79" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="s,sacute,scircumflex,scedilla,scaron,scommaaccent,uni0455"  k="76" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-16" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="V,uni0474,uni0476"  k="-16" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="-16" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="257" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="53" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="65" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="81" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="uni043B,uni0459,uni04C6,uni0513"  k="130" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="132" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="271" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="28" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  k="-15" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="S,Sacute,Scircumflex,Scedilla,Scaron,Scommaaccent"  k="16" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="77" />
+<hkern g1="T,Tcommaaccent,Tcaron,Tbar,Tau,uni0422,uni04AC"  g2="z,zacute,zdotaccent,zcaron"  k="60" />
+<hkern g1="V,uni0474,uni0476"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="75" />
+<hkern g1="V,uni0474,uni0476"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="46" />
+<hkern g1="V,uni0474,uni0476"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="44" />
+<hkern g1="V,uni0474,uni0476"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="46" />
+<hkern g1="V,uni0474,uni0476"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="215" />
+<hkern g1="V,uni0474,uni0476"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="28" />
+<hkern g1="V,uni0474,uni0476"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="11" />
+<hkern g1="V,uni0474,uni0476"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="154" />
+<hkern g1="V,uni0474,uni0476"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="13" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="43" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="33" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="31" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="31" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-14" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="142" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="19" />
+<hkern g1="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="60" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="26" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="21" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="V,uni0474,uni0476"  k="-14" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="-17" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="21" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="31" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="uni043B,uni0459,uni04C6,uni0513"  k="-17" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="47" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="153" />
+<hkern g1="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="25" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="148" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="63" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="65" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="m,n,p,ntilde,nacute,ncommaaccent,ncaron,napostrophe,etatonos,eta,uni0433,uni0438,uni0439,uni043A,uni043C,uni043D,uni043F,uni0440,uni0446,uni0448,uni0449,uni044C,uni044E,uni0453,uni045A,uni045C,uni045D,uni048B,uni049B,uni04A3,uni04A5,uni04C8,uni04CA,uni04CE,uni04E3,uni04E5,uni04F7,uni04F9,uni04FB,uni1E3F"  k="40" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="65" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="s,sacute,scircumflex,scedilla,scaron,scommaaccent,uni0455"  k="58" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-17" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="V,uni0474,uni0476"  k="-18" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="-18" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="230" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="X,Chi,uni0416,uni0425,uni0496,uni04B2,uni04C1,uni04DC,uni04FC"  k="-13" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="39" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="20" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="150" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="29" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="U,Ugrave,Uacute,Ucircumflex,Udieresis,Utilde,Umacron,Ubreve,Uring,Uhungarumlaut,Uogonek,uni1EE4,uni1EE6"  k="96" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  k="-17" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="S,Sacute,Scircumflex,Scedilla,Scaron,Scommaaccent"  k="16" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="23" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="z,zacute,zdotaccent,zcaron"  k="30" />
+<hkern g1="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  g2="J,Jcircumflex,uni0408"  k="96" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="-13" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="21" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="21" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="19" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="27" />
+<hkern g1="Z,Zacute,Zdotaccent,Zcaron,Zeta"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="26" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="17" />
+<hkern g1="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="15" />
+<hkern g1="b,p,thorn,rho,uni0440,uni0444,uni044D,uni048F,uni04ED"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="29" />
+<hkern g1="b,p,thorn,rho,uni0440,uni0444,uni044D,uni048F,uni04ED"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="11" />
+<hkern g1="b,p,thorn,rho,uni0440,uni0444,uni044D,uni048F,uni04ED"  g2="uni043B,uni0459,uni04C6,uni0513"  k="14" />
+<hkern g1="b,p,thorn,rho,uni0440,uni0444,uni044D,uni048F,uni04ED"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="15" />
+<hkern g1="b,p,thorn,rho,uni0440,uni0444,uni044D,uni048F,uni04ED"  g2="z,zacute,zdotaccent,zcaron"  k="15" />
+<hkern g1="c,ccedilla,cacute,ccircumflex,uni010B,ccaron,uni0441,uni04AB"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="11" />
+<hkern g1="e,egrave,eacute,ecircumflex,edieresis,emacron,ebreve,edotaccent,eogonek,ecaron,uni0435,uni0450,uni0451,uni04D7,uni04D9,uni04DB,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="14" />
+<hkern g1="e,egrave,eacute,ecircumflex,edieresis,emacron,ebreve,edotaccent,eogonek,ecaron,uni0435,uni0450,uni0451,uni04D7,uni04D9,uni04DB,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="13" />
+<hkern g1="h,m,n,ntilde,hcircumflex,nacute,ncommaaccent,ncaron,napostrophe,etatonos,eta,uni04BB,uni1E3F"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="16" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="20" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="15" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  g2="uni043B,uni0459,uni04C6,uni0513"  k="16" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="21" />
+<hkern g1="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  g2="z,zacute,zdotaccent,zcaron"  k="16" />
+<hkern g1="r,racute,rcommaaccent,rcaron"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="-16" />
+<hkern g1="r,racute,rcommaaccent,rcaron"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="19" />
+<hkern g1="r,racute,rcommaaccent,rcaron"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="20" />
+<hkern g1="r,racute,rcommaaccent,rcaron"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="172" />
+<hkern g1="r,racute,rcommaaccent,rcaron"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="-18" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="-15" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="15" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="13" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="15" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="165" />
+<hkern g1="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  g2="uni043B,uni0459,uni04C6,uni0513"  k="41" />
+<hkern g1="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="20" />
+<hkern g1="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="39" />
+<hkern g1="z,zacute,zdotaccent,zcaron"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="16" />
+<hkern g1="z,zacute,zdotaccent,zcaron"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="16" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="204" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="162" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="171" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="m,n,p,ntilde,nacute,ncommaaccent,ncaron,napostrophe,etatonos,eta,uni0433,uni0438,uni0439,uni043A,uni043C,uni043D,uni043F,uni0440,uni0446,uni0448,uni0449,uni044C,uni044E,uni0453,uni045A,uni045C,uni045D,uni048B,uni049B,uni04A3,uni04A5,uni04C8,uni04CA,uni04CE,uni04E3,uni04E5,uni04F7,uni04F9,uni04FB,uni1E3F"  k="171" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="154" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="s,sacute,scircumflex,scedilla,scaron,scommaaccent,uni0455"  k="150" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-7" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="V,uni0474,uni0476"  k="-7" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="-7" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="456" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="110" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="u,ugrave,uacute,ucircumflex,udieresis,utilde,umacron,ubreve,uring,uhungarumlaut,uogonek,uhorn,upsilondieresistonos,upsilon,upsilondieresis,upsilontonos,uni1EE5,uni1EE7,uni1EE9,uni1EEB,uni1EED,uni1EEF,uni1EF1"  k="131" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="158" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="uni043B,uni0459,uni04C6,uni0513"  k="241" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="244" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="480" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="67" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="W,Wcircumflex,Wgrave,Wacute,Wdieresis"  k="-5" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="S,Sacute,Scircumflex,Scedilla,Scaron,Scommaaccent"  k="47" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="150" />
+<hkern g1="Gamma,uni0403,uni0413,uni0490,uni0492,uni04F6"  g2="z,zacute,zdotaccent,zcaron"  k="122" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="64" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="100" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="V,uni0474,uni0476"  k="56" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="83" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  k="21" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="uni0427,uni04B6,uni04CB,uni04F4"  k="25" />
+<hkern g1="uni0409,uni040A,uni042A,uni042C,uni0462"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="55" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="A,Agrave,Aacute,Acircumflex,Atilde,Adieresis,Aring,Amacron,Abreve,Aogonek,Aringacute,Alphatonos,Alpha,Delta,Lambda,uni0410,uni0466,uni04D0,uni04D2,uni1E00,uni1EA0,uni1EA2,uni1EA4,uni1EA6,uni1EA8,uni1EAA,uni1EAC,uni1EAE,uni1EB0,uni1EB2,uni1EB4,uni1EB6"  k="91" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="a,agrave,aacute,acircumflex,atilde,adieresis,aring,amacron,abreve,aogonek,aringacute,uni0430,uni04D1,uni04D3,uni1E01,uni1EA1,uni1EA3,uni1EA5,uni1EA7,uni1EA9,uni1EAB,uni1EAD,uni1EAF,uni1EB1,uni1EB3,uni1EB5,uni1EB7"  k="81" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="67" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="m,n,p,ntilde,nacute,ncommaaccent,ncaron,napostrophe,etatonos,eta,uni0433,uni0438,uni0439,uni043A,uni043C,uni043D,uni043F,uni0440,uni0446,uni0448,uni0449,uni044C,uni044E,uni0453,uni045A,uni045C,uni045D,uni048B,uni049B,uni04A3,uni04A5,uni04C8,uni04CA,uni04CE,uni04E3,uni04E5,uni04F7,uni04F9,uni04FB,uni1E3F"  k="82" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="67" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="s,sacute,scircumflex,scedilla,scaron,scommaaccent,uni0455"  k="46" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="T,Tcommaaccent,Tcaron,uni0402,uni040B,uni0422,uni04A0,uni04AC,uni04B4"  k="-18" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="Y,Yacute,Ycircumflex,Ydieresis,Upsilontonos,Upsilon,Upsilondieresis,uni04AE,uni04B0,Ygrave,uni1EF4,uni1EF6,uni1EF8"  k="-18" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="comma,period,colon,quotesinglbase,quotedblbase,uni2025,ellipsis"  k="393" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="uni0409,uni041B,uni04C5,uni0508,uni0512"  k="54" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="uni043B,uni0459,uni04C6,uni0513"  k="69" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="23" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="hyphen,uni00AD,endash,emdash,uni2015"  k="197" />
+<hkern g1="uni040E,uni0423,uni04EE,uni04F0,uni04F2"  g2="C,G,O,Q,Ccedilla,Ograve,Oacute,Ocircumflex,Otilde,Odieresis,Oslash,Cacute,Ccircumflex,uni010A,Ccaron,Gcircumflex,Gbreve,uni0120,Gcommaaccent,Omacron,Obreve,Ohungarumlaut,OE,Ohorn,Oslashacute,Omicrontonos,Theta,Omicron,uni0404,uni041E,uni0421,uni0460,uni0472,uni0478,uni047A,uni047C,uni047E,uni0480,uni04A8,uni04AA,uni04E6,uni04E8,uni04EA,uni050C,uni1ECC,uni1ECE,uni1ED0,uni1ED2,uni1ED4,uni1ED6,uni1ED8,uni1EDA,uni1EDC,uni1EDE,uni1EE0,uni1EE2,uni1F4D"  k="23" />
+<hkern g1="uni0433,uni0453,uni0491,uni04F7,uni04FB"  g2="c,d,e,g,q,ccedilla,egrave,eacute,ecircumflex,edieresis,cacute,ccircumflex,uni010B,ccaron,dcaron,emacron,ebreve,edotaccent,eogonek,ecaron,gcircumflex,gbreve,uni0121,gcommaaccent,oe,ohorn,alphatonos,alpha,sigma1,sigma,uni0435,uni0441,uni0444,uni0450,uni0451,uni0454,uni0479,uni047D,uni0481,uni04A9,uni04AB,uni04D7,uni04D9,uni04DB,uni04E9,uni0501,uni0502,uni0503,uni050D,uni1EB9,uni1EBB,uni1EBD,uni1EBF,uni1EC1,uni1EC3,uni1EC5,uni1EC7,uni1EDB,uni1EDD,uni1EDF,uni1EE3"  k="20" />
+<hkern g1="uni0433,uni0453,uni0491,uni04F7,uni04FB"  g2="o,ograve,oacute,ocircumflex,otilde,odieresis,omacron,obreve,ohungarumlaut,omicron,omicrontonos,uni043E,uni0473,uni04E7,uni04EB,uni1ECD,uni1ECF,uni1ED1,uni1ED3,uni1ED5,uni1ED7,uni1ED9,uni1EE1"  k="20" />
+<hkern g1="uni0433,uni0453,uni0491,uni04F7,uni04FB"  g2="uni043B,uni0459,uni04C6,uni0513"  k="40" />
+<hkern g1="uni044A,uni044C,uni0459,uni045A,uni0463"  g2="quotedbl,quotesingle,uni02BC,quoteleft,quoteright,quotereversed,quotedblleft,quotedblright,minute,second"  k="135" />
+<hkern g1="uni044A,uni044C,uni0459,uni045A,uni0463"  g2="v,y,yacute,ydieresis,ycircumflex,gamma,nu,uni0443,uni045E,uni0475,uni0477,uni04AF,uni04EF,uni04F1,uni04F3,ygrave,uni1EF5,uni1EF7,uni1EF9"  k="35" />
+<hkern g1="uni044A,uni044C,uni0459,uni045A,uni0463"  g2="uni0447,uni04B7,uni04CC,uni04F5"  k="19" />
+<hkern g1="uni044A,uni044C,uni0459,uni045A,uni0463"  g2="x,uni0436,uni0445,uni0497,uni04B3,uni04C2,uni04DD,uni04FD"  k="11" />
+</font>
+</defs></svg>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.ttf b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.ttf
new file mode 100644
index 00000000000..305f0d58cdf
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.ttf differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.woff b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.woff
new file mode 100644
index 00000000000..ac7452a6ddd
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/fonts/Roboto-Regular-webfont.woff differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png
new file mode 100644
index 00000000000..d4aff8b7c19
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png
new file mode 100644
index 00000000000..7b332ecba61
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg
new file mode 100644
index 00000000000..fcdb87de978
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg
@@ -0,0 +1,8 @@
+<svg width="200px"  height="200px"  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="lds-dual-ring" style="background: none;">
+    <circle cx="50" cy="50" ng-attr-r="{{config.radius}}" ng-attr-stroke-width="{{config.width}}" ng-attr-stroke="{{config.c1}}" ng-attr-stroke-dasharray="{{config.dasharray}}" fill="none" stroke-linecap="round" r="40" stroke-width="4" stroke="#84de5c" stroke-dasharray="62.83185307179586 62.83185307179586" transform="rotate(318 50 50)">
+      <animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform>
+    </circle>
+    <circle cx="50" cy="50" ng-attr-r="{{config.radius2}}" ng-attr-stroke-width="{{config.width}}" ng-attr-stroke="{{config.c2}}" ng-attr-stroke-dasharray="{{config.dasharray2}}" ng-attr-stroke-dashoffset="{{config.dashoffset2}}" fill="none" stroke-linecap="round" r="35" stroke-width="4" stroke="#21d129" stroke-dasharray="54.97787143782138 54.97787143782138" stroke-dashoffset="54.97787143782138" transform="rotate(-318 50 50)">
+      <animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;-360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform>
+    </circle>
+  </svg>
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png
new file mode 100644
index 00000000000..2d62a14fea5
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css
new file mode 100644
index 00000000000..3e75f91a741
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css
@@ -0,0 +1,252 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.tile {
+  margin: 5px 5px 0px 5px;
+  padding: 5px;
+  border: 1px solid #cdcdcd;
+  height: 210px;
+  overflow: hidden;
+  background-color: #ffffff;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  min-width: 250px;
+}
+
+.panel {
+  margin: 5px 0px 0px 0px;
+  padding: 5px;
+  border: 1px solid #cdcdcd;
+}
+
+.desc {
+  position: relative;
+  top: 100px;
+  margin: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  height: 60px;
+  padding-right: 25px;
+}
+
+.appBanner {
+  display: block;
+  height: 40px;
+}
+
+.appList {
+  display: block;
+}
+
+html, body, .container {
+  height: 100%;
+}
+
+.container {
+    display:table;
+    width: 100%;
+    margin: 0;
+    padding: 0; /*set left/right padding according to needs*/
+    box-sizing: border-box;
+}
+
+.row {
+    height: 100%;
+    display: table-row;
+}
+
+.wizard {
+    height: 100%;
+    border: none;
+}
+
+.wizard-body {
+    height: 100%;
+}
+
+.navigation-header div.btn-group div {
+    display: inline;
+}
+
+.navigation-header div.btn-group div a:hover {
+    text-decoration: none;
+}
+
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li {
+    color: #999;
+}
+
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li:hover {
+    background-color: #404351;
+}
+
+.navigation-menu-item {
+    padding-left: 30px;
+}
+
+ul.nav.side-nav-menu li {
+    height: 55px;
+}
+
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a {
+    color: #b8bec4;
+}
+
+.navigation-bar {
+    height: 100%;
+}
+
+.navigation-bar-container {
+    height: 100%;
+}
+
+.content {
+    margin: 5px;
+}
+
+.mdl-shadow-4dp {
+    box-shadow: 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12), 0 2px 4px -1px rgba(0,0,0,.2);
+}
+
+/*
+ * hexagon
+ */
+.hexa, .hexa div {
+  position: absolute;
+  top: -5px;
+  left: 0px;
+  overflow: hidden;
+  width: 128px;
+  height: 128px;
+}
+.hexa {
+  width: 128px;
+  height: 96px;
+}
+.hexa div {
+  width: 100%;
+  height: 100%;
+}
+.hexa {
+      -webkit-transform: rotate(120deg);
+       -moz-transform: rotate(120deg);
+        -ms-transform: rotate(120deg);
+         -o-transform: rotate(120deg);
+            transform: rotate(120deg);
+}
+.hex1 {
+      -webkit-transform: rotate(-60deg);
+       -moz-transform: rotate(-60deg);
+        -ms-transform: rotate(-60deg);
+         -o-transform: rotate(-60deg);
+            transform: rotate(-60deg);
+}
+.hex2 {
+  box-shadow: 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12), 0 2px 4px -1px rgba(0,0,0,.2);
+      -webkit-transform: rotate(-60deg);
+       -moz-transform: rotate(-60deg);
+        -ms-transform: rotate(-60deg);
+         -o-transform: rotate(-60deg);
+            transform: rotate(-60deg);
+}
+
+/*
+ * card title
+ */
+.card-title {
+  position: absolute;
+  top: 5px;
+  left: 128px;
+}
+
+.card-desc {
+  margin: 10px;
+  padding-right: 25px;
+}
+
+.card-footer {
+  position: relative;
+  margin: 0px 5px 5px 5px;
+  padding: 5px;
+  background-color: #eeeeee;
+  line-height: 25px;
+  height: 45px;
+  color: #666;
+  font-family: Roboto,sans-serif!important;
+  font-size: 14;
+  min-width: 250px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.toparea {
+  position: fixed;
+  top: 0px;
+  left: 230px;
+  width: calc(100% - 230px);
+  height: 300px;
+  color: #2c2e3b;
+  background: -webkit-linear-gradient(left,#2e3b51 ,#181d2b);
+  background: -moz-linear-gradient(right,#2e3b51,#181d2b);
+  background: -o-linear-gradient(right,#2e3b51,#181d2b);
+  background: linear-gradient(to right,#2e3b51 ,#181d2b);
+}
+
+.pattern-wrapper {
+  width: 100%;
+  height: 300px;
+  background-image: url(img/pattern-f61c2e99f82389a67432f54155c5f483.png);
+  background-repeat: no-repeat;
+  background-position: 0px 30px;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.recommended {
+  color: #fff;
+}
+
+.loader-wrapper {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: #222222;
+  z-index: 1000;
+  opacity: 0.3;
+}
+
+.loader {
+  display: table;
+  margin: 0 auto;
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.loader img {
+  width: 300px;
+  height: 225px;
+}
+
+.infobox {
+    font-size:14px;
+    margin:20px;
+    padding:10px;
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css
new file mode 100644
index 00000000000..e787efe76e0
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.theme-dropdown .dropdown-menu {
+    position: static;
+    display: block;
+    margin-bottom: 20px;
+}
+
+.theme-showcase > p > .btn {
+    margin: 5px 0;
+}
+
+.theme-showcase .navbar .container {
+    width: auto;
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html
new file mode 100644
index 00000000000..7c090a81542
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html
@@ -0,0 +1,82 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<!doctype html>
+<html lang="en" data-ng-app="app">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>YARN Application Catalog</title>
+    <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap-theme.min.css">
+    <link href="css/bootstrap-hadoop.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="css/theme.css">
+    <link rel="stylesheet" href="css/specific.css">
+</head>
+<body role="document">
+<div ng-controller="LoadScreenController" class="loader-wrapper {{loadScreen}}">
+  <div class="loader"><img src="/css/img/loading.svg"></div>
+</div>
+<div class="container">
+  <div class="row">
+      <div class="navigation-bar-container col-sm-3 col-md-3 col-lg-3" ng-controller="AppListController">
+        <ul class="side-nav-header nav nav-pills nav-stacked">
+          <li class="navigation-header">
+            <div class="btn-group">
+              <div>
+                <a href="#"><span class="ambari-header">Applications</span></a>
+              </div>
+              <div class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="toggle-icon glyphicon glyphicon-menu-down"></span>
+              </div>
+              <ul class="dropdown-menu">
+                <li><a href="#!/">Appstore</a></li>
+                <li><a href="#!/new">Register App</a></li>
+              </ul>
+            </div>
+          </li>
+        </ul>
+        <ul class="side-nav-menu nav nav-pills nav-stacked">
+          <li class="mainmenu-li" ng-repeat="yarnApp in appList">
+            <a href="#!/app/{{yarnApp.id}}"><span class="glyphicon glyphicon-ok-sign"></span> {{yarnApp.name}}</a>
+            <a ng-click="deleteApp(yarnApp.id,yarnApp.name)" class="icon-width"><span class="glyphicon glyphicon-remove pull-right"></span></a>
+            <span class="navigation-menu-item">{{yarnApp.app}}</span>
+          </li>
+        </ul>
+        <ul class="side-nav-footer nav nav-pills nav-stacked">
+          <li class="navigation-footer">
+            <a href="#" data-toggle="collapse-side-nav">
+              <span class="navigation-icon fa fa-angle-double-left"></span>
+            </a>
+          </li>
+        </ul>
+      </div>
+
+    <div class="col-xs-9 col-md-9 col-lg-9">
+      <div data-ng-view></div>
+    </div>
+  </div>
+</div>
+<script src="vendor/jquery/dist/jquery.min.js"></script>
+<script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="vendor/angular/angular.min.js"></script>
+<script src="vendor/angular-route/angular-route.min.js"></script>
+<script src="js/bootstrap-hadoop.min.js"></script>
+<script src="js/app.js"></script>
+<script src="js/controllers.js"></script>
+<script src="js/filters.js"></script>
+<script src="js/routes.js"></script>
+<script src="js/services.js"></script>
+</body>
+</html>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js
new file mode 100644
index 00000000000..bd57d5c86a7
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js
@@ -0,0 +1,284 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+$(document).ready(function () {
+  var $accordionToggler = $(this).find('[data-toggle="collapseAccordion"]');
+  $accordionToggler.off('click').on('click', function (event) {
+    var $this = $(this);
+    $this.siblings('.panel-body').slideToggle(500);
+    $this.children().children('.panel-toggle').toggleClass('fa-angle-down fa-angle-up');
+    event.stopPropagation();
+    return false;
+  });
+});
+'use strict';
+
+(function ($) {
+
+  /**
+   * jQuery plugin for navigation bars
+   * Usage:
+   * <pre>
+   *   $('.navigation-bar').navigationBar();
+   * </pre>
+   *
+   * @param {object} options see <code>$.fn.navigationBar.defaults</code>
+   * @returns {$}
+   */
+
+  $.fn.navigationBar = function (options) {
+
+    var settings = $.extend({}, $.fn.navigationBar.defaults, options);
+
+    return this.each(function () {
+      var _this = this;
+
+      var containerSelector = '.navigation-bar-container';
+      var $navigationContainer = $(this).find(containerSelector);
+      var $sideNavToggler = $(this).find('[data-toggle=' + settings.navBarToggleDataAttr + ']');
+      var $subMenuToggler = $(this).find('[data-toggle=' + settings.subMenuNavToggleDataAttr + ']');
+      var firstLvlMenuItemsSelector = '.side-nav-menu>li';
+      var secondLvlMenuItemsSelector = '.side-nav-menu>li>ul>li';
+      var $moreActions = $(this).find('.more-actions');
+      var $dropdownMenu = $moreActions.children('.dropdown-menu');
+
+      $subMenuToggler.each(function (index, toggler) {
+        return $(toggler).parent().addClass('has-sub-menu');
+      });
+
+      if (settings.fitHeight) {
+        $(this).addClass('navigation-bar-fit-height');
+
+        // make scrolling effect on side nav ONLY, i.e. not effected on ambari main contents
+        $(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', function (ev) {
+          var $this = $(this),
+              scrollTop = this.scrollTop,
+              scrollHeight = this.scrollHeight,
+              height = $this.innerHeight(),
+              delta = ev.originalEvent.wheelDelta,
+              up = delta > 0;
+          var prevent = function prevent() {
+            ev.stopPropagation();
+            ev.preventDefault();
+            ev.returnValue = false;
+            return false;
+          };
+
+          if (!up && -delta > scrollHeight - height - scrollTop) {
+            // Scrolling down, but this will take us past the bottom.
+            $this.scrollTop(scrollHeight);
+            return prevent();
+          } else if (up && delta > scrollTop) {
+            // Scrolling up, but this will take us past the top.
+            $this.scrollTop(0);
+            return prevent();
+          }
+        });
+      }
+
+      //set main content left margin based on the width of side-nav
+      var containerWidth = $navigationContainer.width();
+      if (settings.moveLeftContent) {
+        $(settings.content).css('margin-left', containerWidth);
+      }
+      if (settings.moveLeftFooter) {
+        $(settings.footer).css('margin-left', containerWidth);
+      }
+
+      function popStateHandler() {
+        var path = window.location.pathname + window.location.hash;
+        $navigationContainer.find('li a').each(function (index, link) {
+          var $link = $(link);
+          var href = $link.attr('data-href') || $link.attr('href');
+          if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) {
+            $link.parent().addClass('active');
+          } else {
+            $link.parent().removeClass('active');
+          }
+        });
+      }
+
+      if (settings.handlePopState) {
+        popStateHandler();
+        $(window).bind('popstate', popStateHandler);
+      }
+
+      function clickHandler(el) {
+        var $li = $(el).parent();
+        var activeClass = settings.activeClass;
+
+        var activeMenuItems = firstLvlMenuItemsSelector + '.' + activeClass;
+        var activeSubMenuItems = secondLvlMenuItemsSelector + '.' + activeClass;
+        $navigationContainer.find(activeMenuItems).removeClass(activeClass);
+        $navigationContainer.find(activeSubMenuItems).removeClass(activeClass);
+        $li.addClass(activeClass);
+      }
+
+      /**
+       * Click on menu item
+       */
+      $(firstLvlMenuItemsSelector + '>a').on('click', function () {
+        clickHandler(this);
+      });
+
+      /**
+       * Click on sub menu item
+       */
+      $(secondLvlMenuItemsSelector + '>a').on('click', function () {
+        clickHandler(this);
+        $(this).parent().parent().parent().addClass(settings.activeClass);
+      });
+
+      /**
+       * Slider for sub menu
+       */
+      $subMenuToggler.off('click').on('click', function (event) {
+        // ignore click if navigation-bar is collapsed
+        if ($navigationContainer.hasClass('collapsed')) {
+          return false;
+        }
+        var $this = $(this);
+        $this.siblings('.sub-menu').slideToggle(600, function () {
+          var $topMenuItem = $this.parent();
+          var $subMenu = $topMenuItem.find('ul');
+          return $subMenu.is(':visible') ? $topMenuItem.removeClass('collapsed') : $topMenuItem.addClass('collapsed');
+        });
+        $this.children('.toggle-icon').toggleClass(settings.menuLeftClass + ' ' + settings.menuDownClass);
+        event.stopPropagation();
+        return false;
+      });
+
+      /**
+       * Hovering effects for "more actions icon": "..."
+       */
+      $(this).find('.mainmenu-li>a').hover(function () {
+        var $moreIcon = $(this).siblings('.more-actions');
+        if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
+          $moreIcon.css('display', 'inline-block');
+        }
+      }, function () {
+        var $moreIcon = $(this).siblings('.more-actions');
+        if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
+          $moreIcon.hide();
+        }
+      });
+      $moreActions.hover(function () {
+        $(this).css('display', 'inline-block');
+      });
+      if (settings.fitHeight) {
+        $moreActions.on('click', function () {
+          // set actions submenu position
+          var $moreIcon = $(this);
+          var $header = $('.side-nav-header');
+          $dropdownMenu.css({
+            top: $moreIcon.offset().top - $header.offset().top + 20 + 'px',
+            left: $moreIcon.offset().left + 'px'
+          });
+        });
+      }
+      $dropdownMenu.on('click', function () {
+        // some action was triggered, should hide this icon
+        var moreIcon = $(this).parent();
+        setTimeout(function () {
+          moreIcon.hide();
+        }, 1000);
+      });
+      $navigationContainer.children('.side-nav-menu').scroll(function () {
+        $moreActions.removeClass('open');
+      });
+
+      /**
+       * Expand/collapse navigation bar
+       */
+      $sideNavToggler.click(function () {
+
+        $navigationContainer.toggleClass('collapsed').promise().done(function () {
+          var subMenuSelector = 'ul.sub-menu';
+          var $subMenus = $navigationContainer.find(subMenuSelector);
+          var $subMenuItems = $navigationContainer.find('.side-nav-menu>li');
+          if ($navigationContainer.hasClass('collapsed')) {
+            // set sub menu invisible when collapsed
+            $subMenus.hide();
+            $moreActions.hide();
+            // set the hover effect when collapsed, should show sub-menu on hovering
+            $subMenuItems.hover(function () {
+              $(this).find(subMenuSelector).show();
+              // set sub-menu position
+              var $parent = $(this);
+              var $header = $('.side-nav-header');
+              if (settings.fitHeight) {
+                $(this).find(subMenuSelector).css({
+                  position: 'fixed',
+                  top: $parent.offset().top - $header.offset().top + 'px',
+                  left: 50 + 'px'
+                });
+              }
+            }, function () {
+              $(this).find(subMenuSelector).hide();
+            });
+          } else {
+            // keep showing all sub menu
+            $subMenus.show().each(function (index, item) {
+              return $(item).parent().removeClass('collapsed');
+            });
+            $subMenuItems.unbind('mouseenter mouseleave');
+            $navigationContainer.find('.toggle-icon').removeClass(settings.menuLeftClass).addClass(settings.menuDownClass);
+            // set sub-menu position
+            if (settings.fitHeight) {
+              $(_this).find(subMenuSelector).css({
+                position: 'relative',
+                top: 0,
+                left: 0
+              });
+            }
+          }
+
+          $navigationContainer.on('transitionend', function () {
+            //set main content left margin based on the width of side-nav
+            var containerWidth = $navigationContainer.width();
+            if (settings.moveLeftContent) {
+              $(settings.content).css('margin-left', containerWidth);
+            }
+            if (settings.moveLeftFooter) {
+              $(settings.footer).css('margin-left', containerWidth);
+            }
+          });
+          $sideNavToggler.find('span').toggleClass(settings.collapseNavBarClass + ' ' + settings.expandNavBarClass);
+        });
+        return false;
+      });
+    });
+  };
+
+  $.fn.navigationBar.defaults = {
+    handlePopState: true,
+    fitHeight: false,
+    content: '#main',
+    footer: 'footer',
+    moveLeftContent: true,
+    moveLeftFooter: true,
+    menuLeftClass: 'glyphicon-menu-right',
+    menuDownClass: 'glyphicon-menu-down',
+    collapseNavBarClass: 'fa-angle-double-left',
+    expandNavBarClass: 'fa-angle-double-right',
+    activeClass: 'active',
+    navBarToggleDataAttr: 'collapse-side-nav',
+    subMenuNavToggleDataAttr: 'collapse-sub-menu'
+  };
+})(jQuery);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js
new file mode 100644
index 00000000000..687279945b4
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+"use strict";$(document).ready(function(){$(this).find('[data-toggle="collapseAccordion"]').off("click").on("click",function(n){var l=$(this);return l.siblings(".panel-body").slideToggle(500),l.children().children(".panel-toggle").toggleClass("fa-angle-down fa-angle-up"),n.stopPropagation(),!1})});
+"use strict";!function(e){e.fn.navigationBar=function(n){var t=e.extend({},e.fn.navigationBar.defaults,n);return this.each(function(){function n(){var n=window.location.pathname+window.location.hash;i.find("li a").each(function(t,a){var s=e(a),i=s.attr("data-href")||s.attr("href");-1!==n.indexOf(i)&&-1===["","#"].indexOf(i)?s.parent().addClass("active"):s.parent().removeClass("active")})}function a(n){var a=e(n).parent(),s=t.activeClass,o=r+"."+s,l=f+"."+s;i.find(o).removeClass(s),i.find(l).removeClass(s),a.addClass(s)}var s=this,i=e(this).find(".navigation-bar-container"),o=e(this).find("[data-toggle="+t.navBarToggleDataAttr+"]"),l=e(this).find("[data-toggle="+t.subMenuNavToggleDataAttr+"]"),r=".side-nav-menu>li",f=".side-nav-menu>li>ul>li",c=e(this).find(".more-actions"),u=c.children(".dropdown-menu");l.each(function(n,t){return e(t).parent().addClass("has-sub-menu")}),t.fitHeight&&(e(this).addClass("navigation-bar-fit-height"),e(this).find(".side-nav-menu").on("DOMMouseScroll mousewheel",function(n){var t=e(this),a=this.scrollTop,s=this.scrollHeight,i=t.innerHeight(),o=n.originalEvent.wheelDelta,l=o>0,r=function(){return n.stopPropagation(),n.preventDefault(),n.returnValue=!1,!1};return!l&&-o>s-i-a?(t.scrollTop(s),r()):l&&o>a?(t.scrollTop(0),r()):void 0}));var d=i.width();t.moveLeftContent&&e(t.content).css("margin-left",d),t.moveLeftFooter&&e(t.footer).css("margin-left",d),t.handlePopState&&(n(),e(window).bind("popstate",n)),e(r+">a").on("click",function(){a(this)}),e(f+">a").on("click",function(){a(this),e(this).parent().parent().parent().addClass(t.activeClass)}),l.off("click").on("click",function(n){if(i.hasClass("collapsed"))return!1;var a=e(this);return a.siblings(".sub-menu").slideToggle(600,function(){var e=a.parent();return e.find("ul").is(":visible")?e.removeClass("collapsed"):e.addClass("collapsed")}),a.children(".toggle-icon").toggleClass(t.menuLeftClass+" "+t.menuDownClass),n.stopPropagation(),!1}),e(this).find(".mainmenu-li>a").hover(function(){var n=e(this).siblings(".more-actions");n.length&&!i.hasClass("collapsed")&&n.css("display","inline-block")},function(){var n=e(this).siblings(".more-actions");n.length&&!i.hasClass("collapsed")&&n.hide()}),c.hover(function(){e(this).css("display","inline-block")}),t.fitHeight&&c.on("click",function(){var n=e(this),t=e(".side-nav-header");u.css({top:n.offset().top-t.offset().top+20+"px",left:n.offset().left+"px"})}),u.on("click",function(){var n=e(this).parent();setTimeout(function(){n.hide()},1e3)}),i.children(".side-nav-menu").scroll(function(){c.removeClass("open")}),o.click(function(){return i.toggleClass("collapsed").promise().done(function(){var n=i.find("ul.sub-menu"),a=i.find(".side-nav-menu>li");i.hasClass("collapsed")?(n.hide(),c.hide(),a.hover(function(){e(this).find("ul.sub-menu").show();var n=e(this),a=e(".side-nav-header");t.fitHeight&&e(this).find("ul.sub-menu").css({position:"fixed",top:n.offset().top-a.offset().top+"px",left:"50px"})},function(){e(this).find("ul.sub-menu").hide()})):(n.show().each(function(n,t){return e(t).parent().removeClass("collapsed")}),a.unbind("mouseenter mouseleave"),i.find(".toggle-icon").removeClass(t.menuLeftClass).addClass(t.menuDownClass),t.fitHeight&&e(s).find("ul.sub-menu").css({position:"relative",top:0,left:0})),i.on("transitionend",function(){var n=i.width();t.moveLeftContent&&e(t.content).css("margin-left",n),t.moveLeftFooter&&e(t.footer).css("margin-left",n)}),o.find("span").toggleClass(t.collapseNavBarClass+" "+t.expandNavBarClass)}),!1})})},e.fn.navigationBar.defaults={handlePopState:!0,fitHeight:!1,content:"#main",footer:"footer",moveLeftContent:!0,moveLeftFooter:!0,menuLeftClass:"glyphicon-menu-right",menuDownClass:"glyphicon-menu-down",collapseNavBarClass:"fa-angle-double-left",expandNavBarClass:"fa-angle-double-right",activeClass:"active",navBarToggleDataAttr:"collapse-side-nav",subMenuNavToggleDataAttr:"collapse-sub-menu"}}(jQuery);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html
new file mode 100644
index 00000000000..534d0e90e0d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html
@@ -0,0 +1,80 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<div class="container content">
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12">
+        <div class="form-group">
+          <h1>Deploy Application</h1>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-2 col-md-2 col-lg-2">
+        <img ng-src="{{details.icon}}" alt="" width="128" height="128" ng-if="details.icon != null" />
+      </div>
+      <div class="col-xs-10 col-md-10 col-lg-10">
+        <div class="form-group">
+          <h2>{{details.org}}/{{details.name}}</h2>
+          {{details.desc}}
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12">
+        <div class="form-group">
+          <label>Application Name</label>
+          <input type=text name="name" class="form-control" ng-model="details.app.name" autofocus />
+        </div>
+        <div class="form-group">
+          <label>Queue</label>
+          <input type=text name="queue" class="form-control" ng-model="details.app.queue" />
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.app.components track by $index">
+        <div class="panel">
+          <div class="form-group">
+            <label>Component {{docker.name}}</label>
+          </div>
+          <div class="form-group">
+            <label>Number of containers</label>
+            <input type=text name="artifact_id" class="form-control" ng-model="docker.number_of_containers" />
+          </div>
+          <div class="form-group">
+            <label>Environments</label>
+            <textarea json-text name="env" class="form-control" ng-model="docker.configuration.env"/></textarea>
+          </div>
+          <div class="form-group">
+            <label>Properties</label>
+            <textarea json-text name="properties" class="form-control" ng-model="docker.configuration.properties"/></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <br>
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12">
+        <p>
+        <a class="btn btn-secondary" ng-click="launchApp(details.app)">LAUNCH</a>
+        <a class="btn btn-secondary" href="/">CANCEL</a>
+        <span class="infobox bg-info" ng-if="message">{{message}}</span>
+        <span class="infobox bg-danger" ng-if="error">{{error}}</span>
+      </div>
+    </div>
+</div>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html
new file mode 100644
index 00000000000..69ef9126346
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html
@@ -0,0 +1,64 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<div class="container content">
+  <div class="row">
+    <div class="col-xs-12 col-md-12 col-lg-12">
+      <a ng-click="stopApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-stop"></span> Stop</a>
+      <a ng-click="restartApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-refresh"></span> Start</a>
+      <div style="display:inline-block;" ng-repeat="(key, value) in details.yarnfile.quicklinks">
+        <a href="{{value}}" class="btn btn-secondary" ng-hide="checkServiceLink()"><span class="glyphicon glyphicon-new-window"></span> {{key}}</a>
+      </div>
+      {{details.yarnfile.state}}
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.yarnfile.components">
+      <div class="panel">
+        <h3>{{docker.name}}</h3>
+        <p>Artifact: {{docker.artifact.id}}</p>
+        <p>Number of containers: {{docker.number_of_containers}}</p>
+        <p>CPU: {{docker.resource.cpus}}</p>
+        <p>Memory: {{docker.resource.memory}}</p>
+        <p>Environments
+          <table class="table">
+            <tbody class="table-striped">
+              <tr ng-repeat="(key, value) in docker.configuration.env">
+                <td>{{key}}</td><td>{{value}}</td>
+              </tr>
+            </tbody>
+          </table>
+        </p>
+        <table class="table">
+          <thead>
+            <tr>
+              <th>Hostname</th>
+              <th>Container ID</th>
+              <th>Launch Time</th>
+              <th>State</th>
+            </tr>
+          </thead>
+          <tbody class="table-striped">
+            <tr ng-repeat="container in docker.containers">
+              <td>{{container.bare_host}}</td>
+              <td><a href="http://{{container.bare_host}}:8042/terminal/terminal.template?container={{container.id}}" target="_blank">{{container.id}}</a></td>
+              <td>{{container.launch_time | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
+              <td>{{container.state}}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html
new file mode 100644
index 00000000000..e2b7f0876ae
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html
@@ -0,0 +1,52 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<div class="toparea"><div class="pattern-wrapper"></div></div>
+<div class="container content toparea pattern-wrapper">
+      <form>
+        <div class="input-group input-group-lg">
+          <div class="input-group-addon">
+            <span class="glyphicon glyphicon-search" id="search"></span>
+          </div>
+          <input type="text" class="form-control" placeholder="Search for applications from HDFS" aria-describedby="search" ng-model="searchText" ng-change="change(text)" />
+        </div>
+      </form>
+
+      <p></p>
+      <p class="recommended">Recommended</p>
+
+      <div ng-repeat="a in appStore" ng-if="$index % 3 == 0" class="row">
+        <div ng-repeat="i in [$index, $index + 1, $index + 2]"
+             ng-if="appStore[i] != null" class="col-xs-4 col-md-4 col-lg-4">
+          <div class="tile mdl-shadow-4dp">
+            <img ng-src="{{appStore[i].icon}}" alt="" width="128" height="128" ng-if="appStore[i] != null" />
+            <div class="card-title">
+              <h3>{{appStore[i].org}}</h3>
+              <h2>{{appStore[i].name}}</h2>
+            </div>
+            <div class="card-desc">
+              <p>{{appStore[i].desc}}</p>
+            </div>
+          </div>
+          <div class="card-footer mdl-shadow-4dp">
+            <div class="pull-left">
+              <!-- <span class="glyphicon glyphicon-thumbs-up"></span> {{appStore[i].like | counterValue}} -->
+              <span class="glyphicon glyphicon-cloud-download"></span> {{appStore[i].download | counterValue}}
+            </div>
+            <div class="pull-right">
+              <button class="btn btn-secondary" ng-click="deployApp(appStore[i].id)">DEPLOY</button>
+            </div>
+          </div>
+        </div>
+      </div>
+</div>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html
new file mode 100644
index 00000000000..401722520c7
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html
@@ -0,0 +1,111 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<div class="container content">
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12">
+        <div class="form-group">
+          <h1>Register Application</h1>
+        </div>
+        <div class="form-group">
+          <label>Organization Name</label>
+          <input type=text name="org" class="form-control" ng-model="details.organization" />
+        </div>
+        <div class="form-group">
+          <label>Application Name</label>
+          <input type=text name="name" class="form-control" ng-model="details.name" />
+        </div>
+        <div class="form-group">
+          <label>Version</label>
+          <input type=text name="version" class="form-control" ng-model="details.version" />
+        </div>
+        <div class="form-group">
+          <label>Description</label>
+          <textarea name="desc" class="form-control" ng-model="details.description"></textarea>
+        </div>
+        <div class="form-group">
+          <label>Quick Link</label>
+          <textarea json-text name="quicklink" class="form-control" ng-model="details.quicklinks"/></textarea>
+        </div>
+        <div class="form-group">
+          <label>Icon</label>
+          <input type=text name="icon" class="form-control" ng-model="details.icon" />
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.components track by $index">
+        <div class="panel">
+          <div class="pull-right">
+            <a class="btn btn-secondary" ng-click="remove($index)">-</a>
+          </div>
+          <div class="form-group">
+            <label>Component Name</label>
+            <input type=text name="name" class="form-control" ng-model="docker.name" />
+          </div>
+          <div class="form-group">
+            <label>Artifact</label>
+            <input type=text name="artifact_id" class="form-control" ng-model="docker.artifact.id" />
+          </div>
+          <div class="form-group">
+            <label>Number of containers</label>
+            <input type=text name="artifact_id" class="form-control" ng-model="docker.number_of_containers" />
+          </div>
+          <div class="form-group">
+            <label>Launch Command</label>
+            <input type=text name="launch_command" class="form-control" ng-model="docker.launch_command" />
+          </div>
+          <div class="form-group">
+            <label>CPU</label>
+            <input type=text name="cpus" class="form-control" ng-model="docker.resource.cpus" />
+          </div>
+          <div class="form-group">
+            <label>Memory</label>
+            <input type=text name="memory" class="form-control" ng-model="docker.resource.memory" />
+          </div>
+          <div class="form-group">
+            <input type="checkbox" ng-attr-id="{{'checkbox-priv-' + $index}}" ng-model="docker.run_privileged_container">
+            <label for="checkbox-priv-{{$index}}"> Privileged Container</label>
+          </div>
+          <div class="form-group">
+            <label>Dependencies</label>
+            <input json-text type=text name="dependencies" class="form-control" ng-model="docker.dependencies" />
+          </div>
+          <div class="form-group">
+            <label>Placement Policy</label>
+            <input type=text name="placement" class="form-control" ng-model="docker.placement_policy.constraints" />
+          </div>
+          <div class="form-group">
+            <label>Environments</label>
+            <textarea json-text name="env" class="form-control" ng-model="docker.configuration.env"/></textarea>
+          </div>
+          <div class="form-group">
+            <label>Properties</label>
+            <textarea json-text name="properties" class="form-control" ng-model="docker.configuration.properties"/></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <br>
+    <div class="row">
+      <div class="col-xs-12 col-md-12 col-lg-12">
+        <p>
+        <a class="btn btn-secondary" ng-click="add()">+</a>
+        <a class="btn btn-secondary" ng-click="save()">Publish</a>
+        <span class="infobox bg-info" ng-if="message">{{message}}</span>
+        <span class="infobox bg-danger" ng-if="error">{{error}}</span>
+      </div>
+    </div>
+</div>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html
new file mode 100644
index 00000000000..a8a2a2d6a71
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html
@@ -0,0 +1,649 @@
+<!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>Theme Template for Bootstrap</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="vendor/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Bootstrap theme -->
+    <link href="vendor/bootstrap/dist/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="css/theme.css" rel="stylesheet">
+    <link href="css/bootstrap-hadoop.min.css" rel="stylesheet">
+
+</head>
+
+<body role="document">
+
+<!-- Fixed navbar -->
+<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Bootstrap theme</a>
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="active"><a href="index.html">Home</a></li>
+                <li><a href="#about">About</a></li>
+                <li><a href="#contact">Contact</a></li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="#">Action</a></li>
+                        <li><a href="#">Another action</a></li>
+                        <li><a href="#">Something else here</a></li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Nav header</li>
+                        <li><a href="#">Separated link</a></li>
+                        <li><a href="#">One more separated link</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+        <!--/.nav-collapse -->
+    </div>
+</div>
+
+<div class="container theme-showcase" role="main">
+
+<!-- Main jumbotron for a primary marketing message or call to action -->
+<div class="jumbotron">
+    <h1>Hello, world!</h1>
+
+    <p>This is a template for a simple marketing or informational website. It includes a large callout called a
+        jumbotron and three supporting pieces of content. Use it as a starting point to create something more
+        unique.</p>
+
+    <p><a href="#" class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a></p>
+</div>
+
+
+<div class="page-header">
+    <h1>Buttons</h1>
+</div>
+<p>
+    <button type="button" class="btn btn-lg btn-default">Default</button>
+    <button type="button" class="btn btn-lg btn-primary">Primary</button>
+    <button type="button" class="btn btn-lg btn-success">Success</button>
+    <button type="button" class="btn btn-lg btn-info">Info</button>
+    <button type="button" class="btn btn-lg btn-warning">Warning</button>
+    <button type="button" class="btn btn-lg btn-danger">Danger</button>
+    <button type="button" class="btn btn-lg btn-link">Link</button>
+</p>
+<p>
+    <button type="button" class="btn btn-default">Default</button>
+    <button type="button" class="btn btn-primary">Primary</button>
+    <button type="button" class="btn btn-success">Success</button>
+    <button type="button" class="btn btn-info">Info</button>
+    <button type="button" class="btn btn-warning">Warning</button>
+    <button type="button" class="btn btn-danger">Danger</button>
+    <button type="button" class="btn btn-link">Link</button>
+</p>
+<p>
+    <button type="button" class="btn btn-sm btn-default">Default</button>
+    <button type="button" class="btn btn-sm btn-primary">Primary</button>
+    <button type="button" class="btn btn-sm btn-success">Success</button>
+    <button type="button" class="btn btn-sm btn-info">Info</button>
+    <button type="button" class="btn btn-sm btn-warning">Warning</button>
+    <button type="button" class="btn btn-sm btn-danger">Danger</button>
+    <button type="button" class="btn btn-sm btn-link">Link</button>
+</p>
+<p>
+    <button type="button" class="btn btn-xs btn-default">Default</button>
+    <button type="button" class="btn btn-xs btn-primary">Primary</button>
+    <button type="button" class="btn btn-xs btn-success">Success</button>
+    <button type="button" class="btn btn-xs btn-info">Info</button>
+    <button type="button" class="btn btn-xs btn-warning">Warning</button>
+    <button type="button" class="btn btn-xs btn-danger">Danger</button>
+    <button type="button" class="btn btn-xs btn-link">Link</button>
+</p>
+
+
+<div class="page-header">
+    <h1>Tables</h1>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <table class="table">
+            <thead>
+            <tr>
+                <th>#</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Username</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>1</td>
+                <td>Mark</td>
+                <td>Otto</td>
+                <td>@mdo</td>
+            </tr>
+            <tr>
+                <td>2</td>
+                <td>Jacob</td>
+                <td>Thornton</td>
+                <td>@fat</td>
+            </tr>
+            <tr>
+                <td>3</td>
+                <td>Larry</td>
+                <td>the Bird</td>
+                <td>@twitter</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="col-md-6">
+        <table class="table table-striped">
+            <thead>
+            <tr>
+                <th>#</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Username</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>1</td>
+                <td>Mark</td>
+                <td>Otto</td>
+                <td>@mdo</td>
+            </tr>
+            <tr>
+                <td>2</td>
+                <td>Jacob</td>
+                <td>Thornton</td>
+                <td>@fat</td>
+            </tr>
+            <tr>
+                <td>3</td>
+                <td>Larry</td>
+                <td>the Bird</td>
+                <td>@twitter</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-6">
+        <table class="table table-bordered">
+            <thead>
+            <tr>
+                <th>#</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Username</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td rowspan="2">1</td>
+                <td>Mark</td>
+                <td>Otto</td>
+                <td>@mdo</td>
+            </tr>
+            <tr>
+                <td>Mark</td>
+                <td>Otto</td>
+                <td>@TwBootstrap</td>
+            </tr>
+            <tr>
+                <td>2</td>
+                <td>Jacob</td>
+                <td>Thornton</td>
+                <td>@fat</td>
+            </tr>
+            <tr>
+                <td>3</td>
+                <td colspan="2">Larry the Bird</td>
+                <td>@twitter</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="col-md-6">
+        <table class="table table-condensed">
+            <thead>
+            <tr>
+                <th>#</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Username</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>1</td>
+                <td>Mark</td>
+                <td>Otto</td>
+                <td>@mdo</td>
+            </tr>
+            <tr>
+                <td>2</td>
+                <td>Jacob</td>
+                <td>Thornton</td>
+                <td>@fat</td>
+            </tr>
+            <tr>
+                <td>3</td>
+                <td colspan="2">Larry the Bird</td>
+                <td>@twitter</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<div class="page-header">
+    <h1>Thumbnails</h1>
+</div>
+<img data-src="holder.js/200x200" class="img-thumbnail"
+     alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
+
+
+<div class="page-header">
+    <h1>Labels</h1>
+</div>
+<h1>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h1>
+
+<h2>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h2>
+
+<h3>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h3>
+<h4>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h4>
+<h5>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h5>
+<h6>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</h6>
+
+<p>
+    <span class="label label-default">Default</span>
+    <span class="label label-primary">Primary</span>
+    <span class="label label-success">Success</span>
+    <span class="label label-info">Info</span>
+    <span class="label label-warning">Warning</span>
+    <span class="label label-danger">Danger</span>
+</p>
+
+
+<div class="page-header">
+    <h1>Badges</h1>
+</div>
+<p>
+    <a href="#">Inbox <span class="badge">42</span></a>
+</p>
+<ul class="nav nav-pills">
+    <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
+    <li><a href="#">Profile</a></li>
+    <li><a href="#">Messages <span class="badge">3</span></a></li>
+</ul>
+
+
+<div class="page-header">
+    <h1>Dropdown menus</h1>
+</div>
+<div class="dropdown theme-dropdown clearfix">
+    <a id="dropdownMenu1" href="#" role="button" class="sr-only dropdown-toggle" data-toggle="dropdown">Dropdown <span
+            class="caret"></span></a>
+    <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+        <li class="active" role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
+        <li role="presentation" class="divider"></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
+    </ul>
+</div>
+
+
+<div class="page-header">
+    <h1>Navs</h1>
+</div>
+<ul class="nav nav-tabs" role="tablist">
+    <li class="active"><a href="#">Home</a></li>
+    <li><a href="#">Profile</a></li>
+    <li><a href="#">Messages</a></li>
+</ul>
+<ul class="nav nav-pills">
+    <li class="active"><a href="#">Home</a></li>
+    <li><a href="#">Profile</a></li>
+    <li><a href="#">Messages</a></li>
+</ul>
+
+
+<div class="page-header">
+    <h1>Navbars</h1>
+</div>
+
+<div class="navbar navbar-default">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="#about">About</a></li>
+                <li><a href="#contact">Contact</a></li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="#">Action</a></li>
+                        <li><a href="#">Another action</a></li>
+                        <li><a href="#">Something else here</a></li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Nav header</li>
+                        <li><a href="#">Separated link</a></li>
+                        <li><a href="#">One more separated link</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+        <!--/.nav-collapse -->
+    </div>
+</div>
+
+<div class="navbar navbar-inverse">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="#about">About</a></li>
+                <li><a href="#contact">Contact</a></li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="#">Action</a></li>
+                        <li><a href="#">Another action</a></li>
+                        <li><a href="#">Something else here</a></li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Nav header</li>
+                        <li><a href="#">Separated link</a></li>
+                        <li><a href="#">One more separated link</a></li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+        <!--/.nav-collapse -->
+    </div>
+</div>
+
+
+<div class="page-header">
+    <h1>Alerts</h1>
+</div>
+<div class="alert alert-success" role="alert">
+    <strong>Well done!</strong> You successfully read this important alert message.
+</div>
+<div class="alert alert-info" role="alert">
+    <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+</div>
+<div class="alert alert-warning" role="alert">
+    <strong>Warning!</strong> Best check yo self, you're not looking too good.
+</div>
+<div class="alert alert-danger" role="alert">
+    <strong>Oh snap!</strong> Change a few things up and try submitting again.
+</div>
+
+
+<div class="page-header">
+    <h1>Progress bars</h1>
+</div>
+<div class="progress">
+    <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"
+         style="width: 60%;"><span class="sr-only">60% Complete</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0"
+         aria-valuemax="100" style="width: 40%"><span class="sr-only">40% Complete (success)</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0"
+         aria-valuemax="100" style="width: 20%"><span class="sr-only">20% Complete</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0"
+         aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete (warning)</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0"
+         aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0"
+         aria-valuemax="100" style="width: 60%"><span class="sr-only">100% Complete</span></div>
+</div>
+<div class="progress">
+    <div class="progress-bar progress-bar-success" style="width: 35%"><span
+            class="sr-only">35% Complete (success)</span></div>
+    <div class="progress-bar progress-bar-warning" style="width: 20%"><span
+            class="sr-only">20% Complete (warning)</span></div>
+    <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span>
+    </div>
+</div>
+
+
+<div class="page-header">
+    <h1>List groups</h1>
+</div>
+<div class="row">
+    <div class="col-sm-4">
+        <ul class="list-group">
+            <li class="list-group-item">Cras justo odio</li>
+            <li class="list-group-item">Dapibus ac facilisis in</li>
+            <li class="list-group-item">Morbi leo risus</li>
+            <li class="list-group-item">Porta ac consectetur ac</li>
+            <li class="list-group-item">Vestibulum at eros</li>
+        </ul>
+    </div>
+    <!-- /.col-sm-4 -->
+    <div class="col-sm-4">
+        <div class="list-group">
+            <a href="#" class="list-group-item active">
+                Cras justo odio
+            </a>
+            <a href="#" class="list-group-item">Dapibus ac facilisis in</a>
+            <a href="#" class="list-group-item">Morbi leo risus</a>
+            <a href="#" class="list-group-item">Porta ac consectetur ac</a>
+            <a href="#" class="list-group-item">Vestibulum at eros</a>
+        </div>
+    </div>
+    <!-- /.col-sm-4 -->
+    <div class="col-sm-4">
+        <div class="list-group">
+            <a href="#" class="list-group-item active">
+                <h4 class="list-group-item-heading">List group item heading</h4>
+
+                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+                    risus varius blandit.</p>
+            </a>
+            <a href="#" class="list-group-item">
+                <h4 class="list-group-item-heading">List group item heading</h4>
+
+                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+                    risus varius blandit.</p>
+            </a>
+            <a href="#" class="list-group-item">
+                <h4 class="list-group-item-heading">List group item heading</h4>
+
+                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+                    risus varius blandit.</p>
+            </a>
+        </div>
+    </div>
+    <!-- /.col-sm-4 -->
+</div>
+
+
+<div class="page-header">
+    <h1>Panels</h1>
+</div>
+<div class="row">
+    <div class="col-sm-4">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+    </div>
+    <!-- /.col-sm-4 -->
+    <div class="col-sm-4">
+        <div class="panel panel-success">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+        <div class="panel panel-info">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+    </div>
+    <!-- /.col-sm-4 -->
+    <div class="col-sm-4">
+        <div class="panel panel-warning">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+        <div class="panel panel-danger">
+            <div class="panel-heading">
+                <h3 class="panel-title">Panel title</h3>
+            </div>
+            <div class="panel-body">
+                Panel content
+            </div>
+        </div>
+    </div>
+    <!-- /.col-sm-4 -->
+</div>
+
+
+<div class="page-header">
+    <h1>Wells</h1>
+</div>
+<div class="well">
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non
+        magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque
+        nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi
+        erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.</p>
+</div>
+
+
+</div>
+<!-- /container -->
+
+
+<!-- Bootstrap core JavaScript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="vendor/jquery/dist/jquery.min.js"></script>
+<script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="js/bootstrap-hadoop.min.js"></script>
+</body>
+</html>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
new file mode 100644
index 00000000000..2a4b3385325
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.appcatalog.application;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.client.solrj.request.CoreAdminRequest;
+import org.apache.solr.core.NodeConfig;
+import org.apache.solr.core.SolrResourceLoader;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Embedded solr server factory class for unit tests.
+ */
+public final class EmbeddedSolrServerFactory {
+
+  private EmbeddedSolrServerFactory() {
+  }
+
+  /**
+   * Cleans the given solrHome directory and creates a new EmbeddedSolrServer.
+   *
+   * @param solrHome
+   *          the Solr home directory to use
+   * @param configSetHome
+   *          the directory containing config sets
+   * @param coreName
+   *          the name of the core, must have a matching directory in configHome
+   *
+   * @return an EmbeddedSolrServer with a core created for the given coreName
+   * @throws IOException
+   */
+  public static SolrClient create(final String solrHome,
+      final String configSetHome, final String coreName)
+      throws IOException, SolrServerException {
+    return create(solrHome, configSetHome, coreName, true);
+  }
+
+  /**
+   * @param solrHome
+   *          the Solr home directory to use
+   * @param configSetHome
+   *          the directory containing config sets
+   * @param coreName
+   *          the name of the core, must have a matching directory in configHome
+   * @param cleanSolrHome
+   *          if true the directory for solrHome will be deleted and re-created
+   *          if it already exists
+   *
+   * @return an EmbeddedSolrServer with a core created for the given coreName
+   * @throws IOException
+   */
+  public static SolrClient create(final String solrHome,
+      final String configSetHome, final String coreName,
+      final boolean cleanSolrHome) throws IOException, SolrServerException {
+
+    final File solrHomeDir = new File(solrHome);
+    if (solrHomeDir.exists()) {
+      FileUtils.deleteDirectory(solrHomeDir);
+      solrHomeDir.mkdirs();
+    } else {
+      solrHomeDir.mkdirs();
+    }
+
+    final SolrResourceLoader loader = new SolrResourceLoader(
+        solrHomeDir.toPath());
+    final Path configSetPath = Paths.get(configSetHome).toAbsolutePath();
+
+    final NodeConfig config = new NodeConfig.NodeConfigBuilder(
+        "embeddedSolrServerNode", loader)
+            .setConfigSetBaseDirectory(configSetPath.toString()).build();
+
+    final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config,
+        coreName);
+
+    final CoreAdminRequest.Create createRequest = new CoreAdminRequest.Create();
+    createRequest.setCoreName(coreName);
+    createRequest.setConfigSet(coreName);
+    embeddedSolrServer.request(createRequest);
+
+    return embeddedSolrServer;
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
new file mode 100644
index 00000000000..a43e0d4121b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.application;
+
+import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+import org.apache.hadoop.yarn.appcatalog.model.Application;
+import org.apache.solr.client.solrj.SolrClient;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.powermock.api.mockito.PowerMockito;
+import static org.powermock.api.mockito.PowerMockito.when;
+import static org.powermock.api.support.membermodification.MemberMatcher.method;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+/**
+ * Unit test for AppCatalogSolrClient.
+ */
+public class TestAppCatalogSolrClient {
+
+  static final String CONFIGSET_DIR = "src/test/resources/configsets";
+  private static SolrClient solrClient;
+  private static AppCatalogSolrClient spy;
+
+  @Before
+  public void setup() throws Exception {
+    String targetLocation = EmbeddedSolrServerFactory.class
+        .getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
+
+    String solrHome = targetLocation + "/solr";
+    solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR,
+        "exampleCollection");
+    spy = PowerMockito.spy(new AppCatalogSolrClient());
+    when(spy, method(AppCatalogSolrClient.class, "getSolrClient"))
+        .withNoArguments().thenReturn(solrClient);
+  }
+
+  @After
+  public void teardown() throws Exception {
+    try {
+      solrClient.close();
+    } catch (Exception e) {
+    }
+  }
+
+  @Test
+  public void testRegister() throws Exception {
+    Application example = new Application();
+    example.setOrganization("jenkins-ci.org");
+    example.setName("jenkins");
+    example.setDescription("World leading open source automation system.");
+    example.setIcon("/css/img/feather.png");
+    spy.register(example);
+    List<AppStoreEntry> apps = spy.getRecommendedApps();
+    assertEquals(1, apps.size());
+  }
+
+  @Test
+  public void testSearch() throws Exception {
+    Application example = new Application();
+    example.setOrganization("jenkins-ci.org");
+    example.setName("jenkins");
+    example.setDescription("World leading open source automation system.");
+    example.setIcon("/css/img/feather.png");
+    spy.register(example);
+    List<AppStoreEntry> results = spy.search("name_s:jenkins");
+    int expected = 1;
+    int actual = results.size();
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void testNotFoundSearch() throws Exception {
+    Application example = new Application();
+    example.setOrganization("jenkins-ci.org");
+    example.setName("jenkins");
+    example.setDescription("World leading open source automation system.");
+    example.setIcon("/css/img/feather.png");
+    spy.register(example);
+    List<AppStoreEntry> results = spy.search("name_s:abc");
+    int expected = 0;
+    int actual = results.size();
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void testGetRecommendedApps() throws Exception {
+    List<AppStoreEntry> expected = spy.getRecommendedApps();
+    List<AppStoreEntry> actual = spy.getRecommendedApps();
+    assertEquals(expected, actual);
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
new file mode 100644
index 00000000000..ca4fba9bbd2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.service.api.records.Component;
+import org.apache.hadoop.yarn.service.api.records.Container;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Unit test for AppDetailsController.
+ */
+public class AppDetailsControllerTest {
+
+  private AppDetailsController controller;
+
+  @Before
+  public void setUp() throws Exception {
+    this.controller = new AppDetailsController();
+
+  }
+
+  @Test
+  public void testGetDetails() throws Exception {
+    String id = "application 1";
+    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+
+    AppEntry actual = new AppEntry();
+    actual.setName(id);
+    when(ac.getDetails(id)).thenReturn(actual);
+    final AppEntry result = ac.getDetails(id);
+    assertEquals(result, actual);
+  }
+
+  @Test
+  public void testGetStatus() throws Exception {
+    String id = "application 1";
+    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+
+    Service yarnfile = new Service();
+    Component comp = new Component();
+    Container c = new Container();
+    c.setId("container-1");
+    List<Container> containers = new ArrayList<Container>();
+    containers.add(c);
+    comp.setContainers(containers);
+    yarnfile.addComponent(comp);
+    AppEntry actual = new AppEntry();
+    actual.setName(id);
+    actual.setYarnfile(yarnfile);
+    when(ac.getStatus(id)).thenReturn(actual);
+    final AppEntry result = ac.getStatus(id);
+    assertEquals(result, actual);
+  }
+
+  @Test
+  public void testStopApp() throws Exception {
+    String id = "application 1";
+    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+
+    Service yarnfile = new Service();
+    Component comp = new Component();
+    Container c = new Container();
+    c.setId("container-1");
+    List<Container> containers = new ArrayList<Container>();
+    containers.add(c);
+    comp.setContainers(containers);
+    yarnfile.addComponent(comp);
+    Response expected = Response.ok().build();
+    when(ac.stopApp(id)).thenReturn(Response.ok().build());
+    final Response actual = ac.stopApp(id);
+    assertEquals(expected.getStatus(), actual.getStatus());
+  }
+
+  @Test
+  public void testRestartApp() throws Exception {
+    String id = "application 1";
+    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+
+    Service yarnfile = new Service();
+    Component comp = new Component();
+    Container c = new Container();
+    c.setId("container-1");
+    List<Container> containers = new ArrayList<Container>();
+    containers.add(c);
+    comp.setContainers(containers);
+    yarnfile.addComponent(comp);
+    Response expected = Response.ok().build();
+    when(ac.restartApp(id)).thenReturn(Response.ok().build());
+    final Response actual = ac.restartApp(id);
+    assertEquals(expected.getStatus(), actual.getStatus());
+  }
+
+  @Test
+  public void testPathAnnotation() throws Exception {
+    assertNotNull(this.controller.getClass()
+        .getAnnotations());
+    assertThat("The controller has the annotation Path",
+        this.controller.getClass()
+        .isAnnotationPresent(Path.class));
+
+    final Path path = this.controller.getClass()
+        .getAnnotation(Path.class);
+    assertThat("The path is /app_details", path.value(),
+        is("/app_details"));
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
new file mode 100644
index 00000000000..97f288e2476
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+import org.apache.hadoop.yarn.service.api.records.Service;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Unit test for AppListController.
+ */
+public class AppListControllerTest {
+
+  private AppListController controller;
+
+  @Before
+  public void setUp() throws Exception {
+    this.controller = new AppListController();
+
+  }
+
+  @Test
+  public void testGetList() throws Exception {
+    AppListController ac = Mockito.mock(AppListController.class);
+
+    List<AppEntry> actual = new ArrayList<AppEntry>();
+    when(ac.getList()).thenReturn(actual);
+    final List<AppEntry> result = ac.getList();
+    assertEquals(result, actual);
+  }
+
+  @Test
+  public void testDelete() throws Exception {
+    String id = "application 1";
+    AppListController ac = Mockito.mock(AppListController.class);
+
+    Response expected = Response.ok().build();
+    when(ac.delete(id, id)).thenReturn(Response.ok().build());
+    final Response actual = ac.delete(id, id);
+    assertEquals(expected.getStatus(), actual.getStatus());
+  }
+
+  @Test
+  public void testDeploy() throws Exception {
+    String id = "application 1";
+    AppListController ac = Mockito.mock(AppListController.class);
+    Service service = new Service();
+    Response expected = Response.ok().build();
+    when(ac.deploy(id, service)).thenReturn(Response.ok().build());
+    final Response actual = ac.deploy(id, service);
+    assertEquals(expected.getStatus(), actual.getStatus());
+  }
+
+  @Test
+  public void testPathAnnotation() throws Exception {
+    assertNotNull(this.controller.getClass()
+        .getAnnotations());
+    assertThat("The controller has the annotation Path",
+        this.controller.getClass().isAnnotationPresent(Path.class));
+
+    final Path path = this.controller.getClass()
+        .getAnnotation(Path.class);
+    assertThat("The path is /app_list", path.value(), is("/app_list"));
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
new file mode 100644
index 00000000000..d09952b1395
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.appcatalog.controller;
+
+import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+import org.apache.hadoop.yarn.appcatalog.model.Application;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Unit tests for AppStoreController.
+ */
+public class AppStoreControllerTest {
+
+  private AppStoreController controller;
+
+  @Before
+  public void setUp() throws Exception {
+    this.controller = new AppStoreController();
+
+  }
+
+  @Test
+  public void testGetRecommended() throws Exception {
+    AppStoreController ac = Mockito.mock(AppStoreController.class);
+    List<AppStoreEntry> actual = new ArrayList<AppStoreEntry>();
+    when(ac.get()).thenReturn(actual);
+    final List<AppStoreEntry> result = ac.get();
+    assertEquals(result, actual);
+  }
+
+  @Test
+  public void testSearch() throws Exception {
+    String keyword = "jenkins";
+    AppStoreController ac = Mockito.mock(AppStoreController.class);
+    List<AppStoreEntry> expected = new ArrayList<AppStoreEntry>();
+    when(ac.search(keyword)).thenReturn(expected);
+    final List<AppStoreEntry> actual = ac.search(keyword);
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void testRegister() throws Exception {
+    AppStoreController ac = Mockito.mock(AppStoreController.class);
+    Application app = new Application();
+    app.setName("jenkins");
+    app.setOrganization("jenkins.org");
+    app.setDescription("This is a description");
+    app.setIcon("/css/img/feather.png");
+    Response expected = Response.ok().build();
+    when(ac.register(app)).thenReturn(Response.ok().build());
+    final Response actual = ac.register(app);
+    assertEquals(expected.getStatus(), actual.getStatus());
+  }
+
+  @Test
+  public void testPathAnnotation() throws Exception {
+    assertNotNull(this.controller.getClass()
+        .getAnnotations());
+    assertThat("The controller has the annotation Path",
+        this.controller.getClass()
+        .isAnnotationPresent(Path.class));
+
+    final Path path = this.controller.getClass()
+        .getAnnotation(Path.class);
+    assertThat("The path is /app_store", path.value(), is("/app_store"));
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js
new file mode 100644
index 00000000000..ec589342407
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('Controller tests', function () {
+
+  // Unit test for listing, and start/stop applications.
+  describe('AppListController', function() {
+    var scope, ctrl, http, httpBackend;
+
+    beforeEach(module('app'));
+    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+      scope = $rootScope.$new();
+      rootScope = $rootScope;
+      http = $http;
+      httpBackend = $httpBackend;
+      ctrl = $controller('AppListController', {$scope: scope});
+    }));
+
+    afterEach(function() {
+      httpBackend.verifyNoOutstandingExpectation();
+      httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('should contain appList', function () {
+      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.flush();
+      expect(scope.appList.length).toBe(1);
+    });
+
+    it('should test to delete app', function () {
+      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+      httpBackend.expectDELETE('/v1/app_list/jenkins/jenkins').respond(200, {data:"Application Deleted."});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      spyOn(rootScope, '$emit');
+      scope.$apply(function() {
+        scope.deleteApp("jenkins","jenkins");
+      });
+      httpBackend.flush();
+      expect(rootScope.$emit).toHaveBeenCalledWith('RefreshAppList', {});
+    });
+
+    it('should test to refresh appList', function() {
+      spyOn(rootScope, '$emit');
+      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      scope.$apply(function() {
+        scope.refreshList();
+      });
+      httpBackend.flush();
+      expect(rootScope.$emit).toHaveBeenCalledWith('hideLoadScreen', {});
+    })
+  });
+
+  // Unit test for inspect YARN application details.
+  describe('AppDetailsController', function() {
+    var scope, ctrl, http, routeParams, httpBackend;
+
+    beforeEach(module('app'));
+    beforeEach(inject(function ($controller, $rootScope, $http, $routeParams, $httpBackend) {
+      scope = $rootScope.$new();
+      rootScope = $rootScope;
+      http = $http;
+      routeParams = $routeParams;
+      httpBackend = $httpBackend;
+      ctrl = $controller('AppDetailsController', {$scope: scope});
+    }));
+
+    afterEach(function() {
+      httpBackend.verifyNoOutstandingExpectation();
+      httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('should contain unknown state', function () {
+      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.flush();
+      expect(scope.details.yarnfile.state).toBe("UNKNOWN");
+    });
+
+    it('should run test to refrshed details', function () {
+      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+      httpBackend.expectGET('/v1/app_details/status/aabbccdd').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      scope.$apply(function() {
+        routeParams.id = "aabbccdd";
+        scope.appName = "aabbccdd";
+        scope.refreshAppDetails();
+      });
+      httpBackend.flush();
+      expect(scope.details.yarnfile.state).toBe("ACCEPTED");
+    });
+
+    it('should run test to restart app', function () {
+      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+      httpBackend.expectPOST('/v1/app_details/restart/aabbccdd').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.expectGET('/v1/app_details/status/undefined').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+      scope.$apply(function() {
+        scope.restartApp("aabbccdd");
+      });
+      httpBackend.flush();
+      expect(scope.details.yarnfile.components).toBe();
+    });
+
+    it('should run test to stop app', function () {
+      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+      httpBackend.expectPOST('/v1/app_details/stop/aabbccdd').respond(200, {yarnfile:{state: "STOPPED", components:[]}});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.expectGET('/v1/app_details/status/undefined').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+      scope.$apply(function() {
+        scope.stopApp("aabbccdd");
+      });
+      httpBackend.flush();
+      expect(scope.details.yarnfile.components).toBe();
+    });
+
+  });
+
+  // Unit test for deploying app, and search for apps from Yarn Appstore.
+  describe('AppStoreController', function() {
+    var scope, ctrl, http, httpBackend;
+
+    beforeEach(module('app'));
+    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+      scope = $rootScope.$new();
+      http = $http;
+      httpBackend = $httpBackend;
+      ctrl = $controller('AppStoreController', {$scope: scope});
+    }));
+
+    afterEach(function() {
+      httpBackend.verifyNoOutstandingExpectation();
+      httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('should contain appStore', function () {
+      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.flush();
+      expect(scope.appStore.length).toBe(0);
+    });
+
+    it('should run test to deploy app', function() {
+      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.flush();
+      scope.$apply(function() {
+        scope.deployApp("aabbccdd");
+      });
+      expect(scope.appStore.length).toBe(0);
+    });
+
+    it('should run test to search for apps', function() {
+      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+      httpBackend.expectGET('/v1/app_store/search?q=aabbccdd').respond(204, {data:'ACCEPTED'});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      scope.$apply(function() {
+        scope.searchText = "aabbccdd";
+        scope.change("aabbccdd");
+      });
+      httpBackend.flush();
+      expect(scope.appStore.data).toBe('ACCEPTED');
+    });
+
+  });
+
+  // Unit test cases for creating a new YARN application.
+  describe('NewAppController', function() {
+    var scope, ctrl, http, httpBackend;
+
+    beforeEach(module('app'));
+    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+      scope = $rootScope.$new();
+      http = $http;
+      httpBackend = $httpBackend;
+      ctrl = $controller('NewAppController', {$scope: scope});
+    }));
+
+    afterEach(function() {
+      httpBackend.verifyNoOutstandingExpectation();
+      httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('should contain details', function () {
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      httpBackend.flush();
+      expect(scope.details.name).toBe("");
+    });
+
+    it('should run test to register data to backend', function() {
+      httpBackend.expectPOST('/v1/app_store/register').respond(204, {data:'ACCEPTED'});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      scope.$apply(function() {
+        scope.save();
+      });
+      httpBackend.flush();
+      expect(scope.message).toEqual("Application published successfully.");
+    });
+
+    it('should run test to fail register data to backend', function() {
+      httpBackend.expectPOST('/v1/app_store/register').respond(500, {data:'INTERNAL SERVER ERROR'});
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      scope.$apply(function() {
+        scope.save();
+      });
+      httpBackend.flush();
+      expect(scope.error).toEqual("Error in registering application configuration.");
+    });
+
+    it('should run test to add more component to details', function() {
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      expect(scope.details.components.length).toEqual(1);
+      scope.$apply(function() {
+        scope.add();
+      });
+      httpBackend.flush();
+      expect(scope.details.components.length).toEqual(2);
+    });
+
+    it('should run test to remove second component', function() {
+      httpBackend.expectGET('partials/home.html').respond(200, "");
+      expect(scope.details.components.length).toEqual(1);
+      scope.$apply(function() {
+        scope.add();
+        scope.remove(1);
+      });
+      httpBackend.flush();
+      expect(scope.details.components.length).toEqual(1);
+    });
+  });
+
+});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js
new file mode 100644
index 00000000000..f7620a4f933
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js
@@ -0,0 +1,34 @@
+module.exports = function(config){
+  config.set({
+
+    basePath : '../../../',
+
+    files : [
+      'target/generated-sources/vendor/angular**/**.min.js',
+      'target/generated-sources/vendor/angular-mocks/angular-mocks.js',
+      'src/main/javascript/**/*.js',
+      'src/test/javascript/**/*Spec.js',
+      'src/test/javascript/**/!(karma.conf).js'
+    ],
+
+    autoWatch : true,
+
+    frameworks: ['jasmine'],
+
+                 browsers: ['PhantomJS'],
+
+    plugins : [
+            'karma-chrome-launcher',
+            'karma-firefox-launcher',
+            'karma-phantomjs-launcher',
+            'karma-jasmine',
+            'karma-junit-reporter'
+            ],
+
+    junitReporter : {
+      outputFile: 'target/test_out/unit.xml',
+        suite: 'src/test/javascript'
+    }
+
+  });
+};
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz
new file mode 100644
index 00000000000..3352d31e310
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz differ
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt
new file mode 100644
index 00000000000..2c164c0b2a1
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt
@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json
new file mode 100644
index 00000000000..06114ef2577
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json
@@ -0,0 +1,20 @@
+{"params":{
+  "query":{
+    "defType":"edismax",
+    "q.alt":"*:*",
+    "rows":"10",
+    "fl":"*,score",
+    "":{"v":0}
+  },
+  "facets":{
+    "facet":"on",
+    "facet.mincount": "1",
+    "":{"v":0}
+  },
+ "velocity":{
+   "wt": "velocity",
+   "v.template":"browse",
+   "v.layout": "layout",
+   "":{"v":0}
+ }
+}}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt
new file mode 100644
index 00000000000..4341c051434
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt
@@ -0,0 +1,20 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml
new file mode 100644
index 00000000000..20acbc92b46
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<schema name="exampleCollection" version="1.6">
+
+    <!-- Defined fields -->
+    <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" docValues="true" />
+    <field name="type_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="org_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="name_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="desc_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="icon_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="yarnfile_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="like_i" type="int" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="download_i" type="int" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+    <field name="_version_" type="long" indexed="true" stored="false"/>
+
+    <uniqueKey>id</uniqueKey>
+
+    <!-- Field types -->
+    <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
+    <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+    <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
+    <fieldType name="int" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="float" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="long" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="double" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="ints" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="floats" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="longs" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="doubles" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="tint" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="tfloat" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="tlong" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="tdouble" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="tints" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="tfloats" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="tlongs" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="tdoubles" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="date" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="dates" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="tdate" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0"/>
+    <fieldType name="tdates" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0" multiValued="true"/>
+    <fieldType name="binary" class="solr.BinaryField"/>
+    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+
+    <!-- A text field with defaults appropriate for English: it
+         tokenizes with StandardTokenizer, removes English stop words
+         (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
+         finally applies Porter's stemming.  The query time analyzer
+         also applies synonyms from synonyms.txt. -->
+    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <!-- in this example, we will only use synonyms at query time
+        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/> -->
+        <!-- Case insensitive stop word removal. -->
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="lang/stopwords_en.txt"
+            />
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.EnglishPossessiveFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
+        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+        -->
+        <filter class="solr.PorterStemFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="lang/stopwords_en.txt"
+        />
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.EnglishPossessiveFilterFactory"/>
+        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
+        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+        -->
+        <filter class="solr.PorterStemFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- lowercases the entire field value, keeping it as a single token.  -->
+    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory" />
+      </analyzer>
+    </fieldType>
+
+    <!-- since fields of this type are by default not stored or indexed,
+         any data added to them will be ignored outright.  -->
+    <fieldType name="ignored" stored="false" indexed="false" docValues="false" multiValued="true" class="solr.StrField" />
+
+</schema>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml
new file mode 100644
index 00000000000..392feec28aa
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<config>
+  <luceneMatchVersion>6.2.1</luceneMatchVersion>
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+  <indexConfig>
+    <lockType>single</lockType>
+  </indexConfig>
+
+  <requestDispatcher handleSelect="false">
+    <httpCaching never304="true" />
+  </requestDispatcher>
+
+  <requestHandler name="/select" class="solr.SearchHandler" />
+  <requestHandler name="/update" class="solr.UpdateRequestHandler" />
+
+</config>
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt
new file mode 100644
index 00000000000..ae1e83eeb3d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt
new file mode 100644
index 00000000000..0ef0e8daaba
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt
@@ -0,0 +1,28 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaafoo => aaabar
+bbbfoo => bbbfoo bbbbar
+cccfoo => cccbar cccbaz
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties
new file mode 100644
index 00000000000..eb04743a90a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger = INFO, CATALINA
+
+# Define all the appenders
+log4j.appender.CATALINA = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.CATALINA.File = target/appcatalog.log
+log4j.appender.CATALINA.Append = true
+log4j.appender.CATALINA.Encoding = UTF-8
+# Roll-over the log once per day
+log4j.appender.CATALINA.DatePattern = '.'yyyy-MM-dd'.log'
+log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
+log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
new file mode 100644
index 00000000000..770bf24e649
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>hadoop-yarn-applications</artifactId>
+        <groupId>org.apache.hadoop</groupId>
+        <version>3.3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+    <packaging>pom</packaging>
+
+    <name>YARN Application Catalog</name>
+
+    <url>http://hadoop.apache.org</url>
+
+    <modules>
+      <module>hadoop-yarn-applications-catalog-webapp</module>
+      <module>hadoop-yarn-applications-catalog-docker</module>
+    </modules>
+</project>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
index 008f49792de..88f19817e37 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
@@ -77,6 +77,13 @@ public class ApiServiceClient extends AppAdminClient {
   private static final Base64 BASE_64_CODEC = new Base64(0);
   protected YarnClient yarnClient;
 
+  public ApiServiceClient() {
+  }
+
+  public ApiServiceClient(Configuration c) throws Exception {
+    serviceInit(c);
+  }
+
   @Override protected void serviceInit(Configuration configuration)
       throws Exception {
     yarnClient = YarnClient.createYarnClient();
@@ -151,7 +158,7 @@ public class ApiServiceClient extends AppAdminClient {
    * @return URI to API Service
    * @throws IOException
    */
-  private String getServicePath(String appName) throws IOException {
+  public String getServicePath(String appName) throws IOException {
     String url = getRMWebAddress();
     StringBuilder api = new StringBuilder();
     api.append(url)
@@ -212,7 +219,7 @@ public class ApiServiceClient extends AppAdminClient {
     }
   }
 
-  private Builder getApiClient() throws IOException {
+  public Builder getApiClient() throws IOException {
     return getApiClient(getServicePath(null));
   }
 
@@ -223,7 +230,7 @@ public class ApiServiceClient extends AppAdminClient {
    * @return
    * @throws IOException
    */
-  private Builder getApiClient(String requestPath)
+  public Builder getApiClient(String requestPath)
       throws IOException {
     Client client = Client.create(getClientConfig());
     client.setChunkedEncodingSize(null);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json
new file mode 100755
index 00000000000..6a5f2f36a61
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json
@@ -0,0 +1,28 @@
+{
+  "name": "appcatalog",
+  "version": "1",
+  "components" :
+  [
+    {
+      "name": "catalog",
+      "number_of_containers": 1,
+      "artifact": {
+        "id": "apache/hadoop-yarn-applications-catalog-docker:3.3.0-SNAPSHOT",
+        "type": "DOCKER"
+      },
+      "resource": {
+        "cpus": 1,
+        "memory": "2048"
+      },
+      "configuration": {
+        "env": {
+          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+          "YARN_CONTAINER_RUNTIME_DOCKER_MOUNTS":"/etc/hadoop/conf:/etc/hadoop/conf:ro,/var/lib/sss/pipes:/var/lib/sss/pipes:rw",
+          "JAVA_HOME":"/usr/lib/jvm/jre-1.8.0"
+        },
+        "properties": {
+        }
+      }
+    }
+  ]
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
index aefdadd27af..3c8fed68a12 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
@@ -117,8 +117,8 @@ public class ServiceManager implements EventHandler<ServiceEvent> {
 
   @Override
   public void handle(ServiceEvent event) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       State oldState = getState();
       try {
         stateMachine.doTransition(event.getType(), event);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
index 8958dc70e4e..cbc489c4e69 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
@@ -1090,8 +1090,8 @@ public class Component implements EventHandler<ComponentEvent> {
 
   @Override
   public void handle(ComponentEvent event) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       ComponentState oldState = getState();
       try {
         stateMachine.doTransition(event.getType(), event);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
index f44cd6ee611..700408e6633 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
@@ -751,8 +751,8 @@ public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
 
   @Override
   public void handle(ComponentInstanceEvent event) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       ComponentInstanceState oldState = getState();
       try {
         stateMachine.doTransition(event.getType(), event);
@@ -782,8 +782,8 @@ public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
   void updateLocalizationStatuses(
       List<org.apache.hadoop.yarn.api.records.LocalizationStatus> statuses) {
     Map<String, String> resourcesCpy = new HashMap<>();
+    readLock.lock();
     try {
-      readLock.lock();
       if (resolvedParams == null || resolvedParams.didLaunchFail() ||
           resolvedParams.getResolvedRsrcPaths() == null ||
           resolvedParams.getResolvedRsrcPaths().isEmpty()) {
@@ -823,8 +823,8 @@ public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
 
   public void updateResolvedLaunchParams(
       Future<ProviderService.ResolvedLaunchParams> future) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.resolvedParams = future.get();
     } catch (InterruptedException | ExecutionException e) {
       LOG.error("{} updating resolved params", getCompInstanceId(), e);
@@ -834,8 +834,8 @@ public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
   }
 
   public ContainerStatus getContainerStatus() {
+    readLock.lock();
     try {
-      readLock.lock();
       return status;
     } finally {
       readLock.unlock();
@@ -844,8 +844,8 @@ public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
 
   private void setContainerStatus(ContainerId containerId,
       ContainerStatus latestStatus) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.status = latestStatus;
       org.apache.hadoop.yarn.service.api.records.Container containerRec =
           getCompSpec().getContainer(containerId.toString());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
index 61ca77a0598..78b709a45ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
@@ -37,6 +37,7 @@
     <module>hadoop-yarn-applications-distributedshell</module>
     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
     <module>hadoop-yarn-services</module>
+    <module>hadoop-yarn-applications-catalog</module>
   </modules>
 
  <profiles>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java
index 73c49906c37..b6ba660e52c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -37,8 +37,8 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
 public class FileSystemBasedConfigurationProvider
     extends ConfigurationProvider {
 
-  private static final Log LOG = LogFactory
-      .getLog(FileSystemBasedConfigurationProvider.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(FileSystemBasedConfigurationProvider.class);
   private FileSystem fs;
   private Path configDir;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java
index 7b4b77408de..d2ca6f3cd68 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/YarnUncaughtExceptionHandler.java
@@ -20,8 +20,10 @@ package org.apache.hadoop.yarn;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.util.ExitUtil;
@@ -39,7 +41,10 @@ import org.apache.hadoop.util.ShutdownHookManager;
 @Public
 @Evolving
 public class YarnUncaughtExceptionHandler implements UncaughtExceptionHandler {
-  private static final Log LOG = LogFactory.getLog(YarnUncaughtExceptionHandler.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(YarnUncaughtExceptionHandler.class);
+  private static final Marker FATAL =
+      MarkerFactory.getMarker("FATAL");
   
   @Override
   public void uncaughtException(Thread t, Throwable e) {
@@ -48,7 +53,8 @@ public class YarnUncaughtExceptionHandler implements UncaughtExceptionHandler {
       		"down, so ignoring this", e);
     } else if(e instanceof Error) {
       try {
-        LOG.fatal("Thread " + t + " threw an Error.  Shutting down now...", e);
+        LOG.error(FATAL,
+            "Thread " + t + " threw an Error.  Shutting down now...", e);
       } catch (Throwable err) {
         //We don't want to not exit because of an issue with logging
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java
index 076a49dac98..36fc959cbb3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.api.records.impl.pb;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
@@ -41,7 +41,8 @@ import java.util.Map;
 @Unstable
 public class ResourcePBImpl extends Resource {
 
-  private static final Log LOG = LogFactory.getLog(ResourcePBImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ResourcePBImpl.class);
 
   ResourceProto proto = ResourceProto.getDefaultInstance();
   ResourceProto.Builder builder = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java
index d52348747b2..e2978b7042f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/AHSProxy.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.security.PrivilegedAction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -35,7 +35,8 @@ import org.apache.hadoop.yarn.ipc.YarnRPC;
 @SuppressWarnings("unchecked")
 public class AHSProxy<T> {
 
-  private static final Log LOG = LogFactory.getLog(AHSProxy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AHSProxy.class);
 
   public static <T> T createAHSProxy(final Configuration conf,
       final Class<T> protocol, InetSocketAddress ahsAddress) throws IOException {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java
index 5b028e1925f..496b984f67e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ClientRMProxy.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -47,7 +47,8 @@ import com.google.common.base.Preconditions;
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ClientRMProxy<T> extends RMProxy<T>  {
-  private static final Log LOG = LogFactory.getLog(ClientRMProxy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ClientRMProxy.class);
 
   private interface ClientRMProtocols extends ApplicationClientProtocol,
       ApplicationMasterProtocol, ResourceManagerAdministrationProtocol {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java
index d6b6cce996f..89c8753868e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java
@@ -25,8 +25,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -39,8 +39,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 @InterfaceStability.Unstable
 public class ConfiguredRMFailoverProxyProvider<T>
     implements RMFailoverProxyProvider<T> {
-  private static final Log LOG =
-      LogFactory.getLog(ConfiguredRMFailoverProxyProvider.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ConfiguredRMFailoverProxyProvider.class);
 
   private int currentProxyIndex = 0;
   Map<String, T> proxies = new HashMap<String, T>();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
index f7cb47a9dc8..d385d3e42c6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
@@ -30,8 +30,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -56,7 +56,8 @@ import com.google.common.annotations.VisibleForTesting;
 @SuppressWarnings("unchecked")
 public class RMProxy<T> {
 
-  private static final Log LOG = LogFactory.getLog(RMProxy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMProxy.class);
   private UserGroupInformation user;
 
   protected RMProxy() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index c1e9da13f74..d4c7f6fccbf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -34,8 +34,8 @@ import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.retry.RetryPolicy;
 import org.apache.hadoop.io.retry.RetryProxy;
@@ -55,8 +55,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 public class RequestHedgingRMFailoverProxyProvider<T>
     extends ConfiguredRMFailoverProxyProvider<T> {
 
-  private static final Log LOG =
-      LogFactory.getLog(RequestHedgingRMFailoverProxyProvider.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RequestHedgingRMFailoverProxyProvider.class);
 
   private volatile String successfulProxy = null;
   private ProxyInfo<T> wrappedProxy = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java
index abc2a280708..7fea1dbcdbe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/DirectTimelineWriter.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.client.api.impl;
 import java.io.IOException;
 import java.net.URI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -42,8 +42,8 @@ import com.sun.jersey.api.client.Client;
 @Unstable
 public class DirectTimelineWriter extends TimelineWriter{
 
-  private static final Log LOG = LogFactory
-      .getLog(DirectTimelineWriter.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(DirectTimelineWriter.class);
 
   public DirectTimelineWriter(UserGroupInformation authUgi,
       Client client, URI resURI) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java
index c00a0b8bd17..ace5fdfc644 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/FileSystemTimelineWriter.java
@@ -38,8 +38,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -78,8 +78,8 @@ import com.sun.jersey.api.client.Client;
 @Unstable
 public class FileSystemTimelineWriter extends TimelineWriter{
 
-  private static final Log LOG = LogFactory
-      .getLog(FileSystemTimelineWriter.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(FileSystemTimelineWriter.class);
 
   // App log directory must be readable by group so server can access logs
   // and writable by group so it can be deleted by server
@@ -267,7 +267,7 @@ public class FileSystemTimelineWriter extends TimelineWriter{
       LOG.debug("Closing cache");
       logFDsCache.flush();
     }
-    IOUtils.cleanup(LOG, logFDsCache, fs);
+    IOUtils.cleanupWithLogger(LOG, logFDsCache, fs);
   }
 
   @Override
@@ -355,8 +355,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     public void close() {
       if (stream != null) {
-        IOUtils.cleanup(LOG, jsonGenerator);
-        IOUtils.cleanup(LOG, stream);
+        IOUtils.cleanupWithLogger(LOG, jsonGenerator);
+        IOUtils.cleanupWithLogger(LOG, stream);
         stream = null;
         jsonGenerator = null;
       }
@@ -478,8 +478,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     @Override
     public void flush() throws IOException {
+      this.domainFDLocker.lock();
       try {
-        this.domainFDLocker.lock();
         if (domainLogFD != null) {
           domainLogFD.flush();
         }
@@ -494,8 +494,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     private Map<ApplicationAttemptId, EntityLogFD> copySummaryLogFDs(
         Map<ApplicationAttemptId, EntityLogFD> summanyLogFDsToCopy) {
+      summaryTableCopyLocker.lock();
       try {
-        summaryTableCopyLocker.lock();
         return new HashMap<ApplicationAttemptId, EntityLogFD>(
             summanyLogFDsToCopy);
       } finally {
@@ -506,8 +506,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
     private Map<ApplicationAttemptId, HashMap<TimelineEntityGroupId,
         EntityLogFD>> copyEntityLogFDs(Map<ApplicationAttemptId,
         HashMap<TimelineEntityGroupId, EntityLogFD>> entityLogFDsToCopy) {
+      entityTableCopyLocker.lock();
       try {
-        entityTableCopyLocker.lock();
         return new HashMap<ApplicationAttemptId, HashMap<TimelineEntityGroupId,
             EntityLogFD>>(entityLogFDsToCopy);
       } finally {
@@ -521,8 +521,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         for (Entry<ApplicationAttemptId, EntityLogFD> logFDEntry : logFDs
             .entrySet()) {
           EntityLogFD logFD = logFDEntry.getValue();
+          logFD.lock();
           try {
-            logFD.lock();
             logFD.flush();
           } finally {
             logFD.unlock();
@@ -541,8 +541,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
           for (Entry<TimelineEntityGroupId, EntityLogFD> logFDEntry
               : logFDMap.entrySet()) {
             EntityLogFD logFD = logFDEntry.getValue();
+            logFD.lock();
             try {
-              logFD.lock();
               logFD.flush();
             } finally {
               logFD.unlock();
@@ -559,7 +559,7 @@ public class FileSystemTimelineWriter extends TimelineWriter{
           flush();
         } catch (Exception e) {
           if (LOG.isDebugEnabled()) {
-            LOG.debug(e);
+            LOG.debug(e.toString());
           }
         }
       }
@@ -567,8 +567,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     private void cleanInActiveFDs() {
       long currentTimeStamp = Time.monotonicNow();
+      this.domainFDLocker.lock();
       try {
-        this.domainFDLocker.lock();
         if (domainLogFD != null) {
           if (currentTimeStamp - domainLogFD.getLastModifiedTime() >= ttl) {
             domainLogFD.close();
@@ -593,8 +593,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         for (Entry<ApplicationAttemptId, EntityLogFD> logFDEntry : logFDs
             .entrySet()) {
           EntityLogFD logFD = logFDEntry.getValue();
+          logFD.lock();
           try {
-            logFD.lock();
             if (currentTimeStamp - logFD.getLastModifiedTime() >= ttl) {
               logFD.close();
             }
@@ -617,8 +617,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
           for (Entry<TimelineEntityGroupId, EntityLogFD> logFDEntry
               : logFDMap.entrySet()) {
             EntityLogFD logFD = logFDEntry.getValue();
+            logFD.lock();
             try {
-              logFD.lock();
               if (currentTimeStamp - logFD.getLastModifiedTime() >= ttl) {
                 logFD.close();
               }
@@ -636,7 +636,7 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         try {
           cleanInActiveFDs();
         } catch (Exception e) {
-          LOG.warn(e);
+          LOG.warn(e.toString());
         }
       }
     }
@@ -644,8 +644,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
     private class TimerMonitorTask extends TimerTask {
       @Override
       public void run() {
+        timerTasksMonitorWriteLock.lock();
         try {
-          timerTasksMonitorWriteLock.lock();
           monitorTimerTasks();
         } finally {
           timerTasksMonitorWriteLock.unlock();
@@ -691,8 +691,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         monitorTaskTimer = null;
       }
 
+      this.domainFDLocker.lock();
       try {
-        this.domainFDLocker.lock();
         if (domainLogFD != null) {
           domainLogFD.close();
           domainLogFD = null;
@@ -708,8 +708,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     private void closeEntityFDs(Map<ApplicationAttemptId,
         HashMap<TimelineEntityGroupId, EntityLogFD>> logFDs) {
+      entityTableLocker.lock();
       try {
-        entityTableLocker.lock();
         if (!logFDs.isEmpty()) {
           for (Entry<ApplicationAttemptId, HashMap<TimelineEntityGroupId,
                    EntityLogFD>> logFDMapEntry : logFDs.entrySet()) {
@@ -734,8 +734,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
 
     private void closeSummaryFDs(
         Map<ApplicationAttemptId, EntityLogFD> logFDs) {
+      summaryTableLocker.lock();
       try {
-        summaryTableLocker.lock();
         if (!logFDs.isEmpty()) {
           for (Entry<ApplicationAttemptId, EntityLogFD> logFDEntry
               : logFDs.entrySet()) {
@@ -757,8 +757,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         ObjectMapper objMapper, TimelineDomain domain,
         boolean isAppendSupported) throws IOException {
       checkAndStartTimeTasks();
+      this.domainFDLocker.lock();
       try {
-        this.domainFDLocker.lock();
         if (this.domainLogFD != null) {
           this.domainLogFD.writeDomain(domain);
         } else {
@@ -790,8 +790,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
       if (logMapFD != null) {
         EntityLogFD logFD = logMapFD.get(groupId);
         if (logFD != null) {
+          logFD.lock();
           try {
-            logFD.lock();
             if (serviceStopped) {
               return;
             }
@@ -814,8 +814,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         TimelineEntityGroupId groupId, List<TimelineEntity> entities,
         boolean isAppendSupported, Map<ApplicationAttemptId, HashMap<
             TimelineEntityGroupId, EntityLogFD>> logFDs) throws IOException{
+      entityTableLocker.lock();
       try {
-        entityTableLocker.lock();
         if (serviceStopped) {
           return;
         }
@@ -828,11 +828,11 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         if (logFD == null) {
           logFD = new EntityLogFD(fs, logPath, objMapper, isAppendSupported);
         }
+        logFD.lock();
         try {
-          logFD.lock();
           logFD.writeEntities(entities);
+          entityTableCopyLocker.lock();
           try {
-            entityTableCopyLocker.lock();
             logFDMap.put(groupId, logFD);
             logFDs.put(attemptId, logFDMap);
           } finally {
@@ -862,8 +862,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
       EntityLogFD logFD = null;
       logFD = logFDs.get(attemptId);
       if (logFD != null) {
+        logFD.lock();
         try {
-          logFD.lock();
           if (serviceStopped) {
             return;
           }
@@ -881,8 +881,8 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         ObjectMapper objMapper, ApplicationAttemptId attemptId,
         List<TimelineEntity> entities, boolean isAppendSupported,
         Map<ApplicationAttemptId, EntityLogFD> logFDs) throws IOException {
+      summaryTableLocker.lock();
       try {
-        summaryTableLocker.lock();
         if (serviceStopped) {
           return;
         }
@@ -890,11 +890,11 @@ public class FileSystemTimelineWriter extends TimelineWriter{
         if (logFD == null) {
           logFD = new EntityLogFD(fs, logPath, objMapper, isAppendSupported);
         }
+        logFD.lock();
         try {
-          logFD.lock();
           logFD.writeEntities(entities);
+          summaryTableCopyLocker.lock();
           try {
-            summaryTableCopyLocker.lock();
             logFDs.put(attemptId, logFD);
           } finally {
             summaryTableCopyLocker.unlock();
@@ -928,12 +928,12 @@ public class FileSystemTimelineWriter extends TimelineWriter{
     }
 
     private void checkAndStartTimeTasks() {
+      this.timerTasksMonitorReadLock.lock();
       try {
-        this.timerTasksMonitorReadLock.lock();
         this.timeStampOfLastWrite = Time.monotonicNow();
         if(!timerTaskStarted) {
+          timerTaskLocker.lock();
           try {
-            timerTaskLocker.lock();
             if (!timerTaskStarted) {
               createAndStartTimerTasks();
               timerTaskStarted = true;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
index 88fccd934c2..7eb4ec129c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
@@ -28,8 +28,8 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.conf.Configuration;
@@ -58,7 +58,8 @@ import com.sun.jersey.api.client.Client;
 @Evolving
 public class TimelineClientImpl extends TimelineClient {
 
-  private static final Log LOG = LogFactory.getLog(TimelineClientImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineClientImpl.class);
   private static final ObjectMapper MAPPER = new ObjectMapper();
   private static final String RESOURCE_URI_STR_V1 = "/ws/v1/timeline/";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java
index 9d084d71929..ca0f307cdb4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java
@@ -34,8 +34,8 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -73,7 +73,8 @@ import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
 public class TimelineConnector extends AbstractService {
 
   private static final Joiner JOINER = Joiner.on("");
-  private static final Log LOG = LogFactory.getLog(TimelineConnector.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineConnector.class);
   public final static int DEFAULT_SOCKET_TIMEOUT = 1 * 60 * 1000; // 1 minute
 
   private SSLFactory sslFactory;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java
index db53f93136f..475864e1c08 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineReaderClientImpl.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.yarn.client.api.impl;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -53,8 +53,8 @@ import static org.apache.hadoop.yarn.util.StringHelper.PATH_JOINER;
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
 public class TimelineReaderClientImpl extends TimelineReaderClient {
-  private static final Log LOG =
-      LogFactory.getLog(TimelineReaderClientImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineReaderClientImpl.class);
 
   private static final String RESOURCE_URI_STR_V2 = "/ws/v2/timeline/";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
index c7c6587597d..e086e27cbc0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
@@ -36,8 +36,8 @@ import java.util.concurrent.TimeUnit;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
@@ -64,7 +64,8 @@ import com.sun.jersey.core.util.MultivaluedMapImpl;
  *
  */
 public class TimelineV2ClientImpl extends TimelineV2Client {
-  private static final Log LOG = LogFactory.getLog(TimelineV2ClientImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineV2ClientImpl.class);
 
   private static final String RESOURCE_URI_STR_V2 = "/ws/v2/timeline/";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java
index b3a886baf10..f52479d6adb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineWriter.java
@@ -26,8 +26,8 @@ import java.net.URI;
 import java.security.PrivilegedExceptionAction;
 import javax.ws.rs.core.MediaType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -52,8 +52,8 @@ import com.sun.jersey.api.client.WebResource;
 @Unstable
 public abstract class TimelineWriter implements Flushable {
 
-  private static final Log LOG = LogFactory
-      .getLog(TimelineWriter.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TimelineWriter.class);
 
   private UserGroupInformation authUgi;
   private Client client;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java
index 4a78a226d6a..333faa5de7d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java
@@ -25,8 +25,10 @@ import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.service.AbstractService;
@@ -46,7 +48,10 @@ import com.google.common.annotations.VisibleForTesting;
 @Evolving
 public class AsyncDispatcher extends AbstractService implements Dispatcher {
 
-  private static final Log LOG = LogFactory.getLog(AsyncDispatcher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AsyncDispatcher.class);
+  private static final Marker FATAL =
+      MarkerFactory.getMarker("FATAL");
 
   private final BlockingQueue<Event> eventQueue;
   private volatile int lastEventQueueSizeLogged = 0;
@@ -200,7 +205,7 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher {
       }
     } catch (Throwable t) {
       //TODO Maybe log the state of the queue
-      LOG.fatal("Error in dispatcher thread", t);
+      LOG.error(FATAL, "Error in dispatcher thread", t);
       // If serviceStop is called, we should exit this thread gracefully.
       if (exitOnDispatchException
           && (ShutdownHookManager.get().isShutdownInProgress()) == false
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java
index 7c7a87be665..ccd8e2e22b8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/EventDispatcher.java
@@ -19,8 +19,10 @@
 package org.apache.hadoop.yarn.event;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
@@ -46,7 +48,10 @@ public class EventDispatcher<T extends Event> extends
   private volatile boolean stopped = false;
   private boolean shouldExitOnError = true;
 
-  private static final Log LOG = LogFactory.getLog(EventDispatcher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(EventDispatcher.class);
+  private static final Marker FATAL =
+      MarkerFactory.getMarker("FATAL");
 
   private final class EventProcessor implements Runnable {
     @Override
@@ -72,7 +77,7 @@ public class EventDispatcher<T extends Event> extends
             LOG.warn("Exception during shutdown: ", t);
             break;
           }
-          LOG.fatal("Error in handling event type " + event.getType()
+          LOG.error(FATAL, "Error in handling event type " + event.getType()
               + " to the Event Dispatcher", t);
           if (shouldExitOnError
               && !ShutdownHookManager.get().isShutdownInProgress()) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java
index 07c5e23a101..c28ea334ea4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcClientFactoryPBImpl.java
@@ -27,8 +27,8 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.HadoopIllegalArgumentException;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
@@ -38,8 +38,8 @@ import org.apache.hadoop.yarn.factories.RpcClientFactory;
 @Private
 public class RpcClientFactoryPBImpl implements RpcClientFactory {
 
-  private static final Log LOG = LogFactory
-      .getLog(RpcClientFactoryPBImpl.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RpcClientFactoryPBImpl.class);
 
   private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.client";
   private static final String PB_IMPL_CLASS_SUFFIX = "PBClientImpl";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java
index ec9a5f2d3f9..677850cc49e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/factories/impl/pb/RpcServerFactoryPBImpl.java
@@ -26,8 +26,8 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.ProtobufRpcEngine;
@@ -43,7 +43,8 @@ import com.google.protobuf.BlockingService;
 @Private
 public class RpcServerFactoryPBImpl implements RpcServerFactory {
 
-  private static final Log LOG = LogFactory.getLog(RpcServerFactoryPBImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RpcServerFactoryPBImpl.class);
   private static final String PROTO_GEN_PACKAGE_NAME = "org.apache.hadoop.yarn.proto";
   private static final String PROTO_GEN_CLASS_SUFFIX = "Service";
   private static final String PB_IMPL_PACKAGE_SUFFIX = "impl.pb.service";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java
index 040917d2b04..d9d999fc01f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnProtoRPC.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.ipc;
 
 import java.net.InetSocketAddress;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.Server;
@@ -39,7 +39,8 @@ import org.apache.hadoop.yarn.factory.providers.RpcFactoryProvider;
 @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" })
 public class HadoopYarnProtoRPC extends YarnRPC {
 
-  private static final Log LOG = LogFactory.getLog(HadoopYarnProtoRPC.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(HadoopYarnProtoRPC.class);
 
   @Override
   public Object getProxy(Class protocol, InetSocketAddress addr,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
index 7f9fb779e56..436445f7074 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/YarnRPC.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.ipc;
 
 import java.net.InetSocketAddress;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.Server;
@@ -35,7 +35,8 @@ import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
  */
 @InterfaceAudience.LimitedPrivate({ "MapReduce", "YARN" })
 public abstract class YarnRPC {
-  private static final Log LOG = LogFactory.getLog(YarnRPC.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(YarnRPC.class);
   
   public abstract Object getProxy(Class protocol, InetSocketAddress addr,
       Configuration conf);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java
index 841b8708371..90395aa8dea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogDeletionService.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -50,7 +50,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 @InterfaceAudience.LimitedPrivate({"yarn", "mapreduce"})
 public class AggregatedLogDeletionService extends AbstractService {
-  private static final Log LOG = LogFactory.getLog(AggregatedLogDeletionService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AggregatedLogDeletionService.class);
   
   private Timer timer = null;
   private long checkIntervalMsecs;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java
index cf40209de1e..8339c1aa8cb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/LogAggregationFileControllerFactory.java
@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -51,7 +51,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 @Unstable
 public class LogAggregationFileControllerFactory {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       LogAggregationFileControllerFactory.class);
   private final Pattern p = Pattern.compile(
       "^[A-Za-z_]+[A-Za-z0-9_]*$");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java
index b3103d29add..108595b68b3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/tfile/LogAggregationTFileController.java
@@ -27,8 +27,8 @@ import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.math3.util.Pair;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -67,7 +67,7 @@ import org.apache.hadoop.yarn.webapp.view.HtmlBlock.Block;
 public class LogAggregationTFileController
     extends LogAggregationFileController {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       LogAggregationTFileController.class);
 
   private LogWriter writer;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 19254c15b1b..c706989e73d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -37,8 +37,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.service.AbstractService;
@@ -63,7 +63,8 @@ import com.google.common.collect.ImmutableSet;
 
 @Private
 public class CommonNodeLabelsManager extends AbstractService {
-  protected static final Log LOG = LogFactory.getLog(CommonNodeLabelsManager.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(CommonNodeLabelsManager.class);
   public static final Set<String> EMPTY_STRING_SET = Collections
       .unmodifiableSet(new HashSet<String>(0));
   public static final Set<NodeLabel> EMPTY_NODELABEL_SET = Collections
@@ -765,8 +766,8 @@ public class CommonNodeLabelsManager extends AbstractService {
 
   @SuppressWarnings("unchecked")
   private <T> Map<NodeId, Set<T>> generateNodeLabelsInfoPerNode(Class<T> type) {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<NodeId, Set<T>> nodeToLabels = new HashMap<>();
       for (Entry<String, Host> entry : nodeCollections.entrySet()) {
         String hostName = entry.getKey();
@@ -808,8 +809,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return set of nodes with no labels
    */
   public Set<NodeId> getNodesWithoutALabel() {
+    readLock.lock();
     try {
-      readLock.lock();
       Set<NodeId> nodes = new HashSet<>();
       for (Host host : nodeCollections.values()) {
         for (NodeId nodeId : host.nms.keySet()) {
@@ -831,8 +832,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return labels to nodes map
    */
   public Map<String, Set<NodeId>> getLabelsToNodes() {
+    readLock.lock();
     try {
-      readLock.lock();
       return getLabelsToNodes(labelCollections.keySet());
     } finally {
       readLock.unlock();
@@ -847,8 +848,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return labels to nodes map
    */
   public Map<String, Set<NodeId>> getLabelsToNodes(Set<String> labels) {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<String, Set<NodeId>> labelsToNodes = getLabelsToNodesMapping(labels,
           String.class);
       return Collections.unmodifiableMap(labelsToNodes);
@@ -864,8 +865,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return labels to nodes map
    */
   public Map<NodeLabel, Set<NodeId>> getLabelsInfoToNodes() {
+    readLock.lock();
     try {
-      readLock.lock();
       return getLabelsInfoToNodes(labelCollections.keySet());
     } finally {
       readLock.unlock();
@@ -881,8 +882,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return labels to nodes map
    */
   public Map<NodeLabel, Set<NodeId>> getLabelsInfoToNodes(Set<String> labels) {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<NodeLabel, Set<NodeId>> labelsToNodes = getLabelsToNodesMapping(
           labels, NodeLabel.class);
       return Collections.unmodifiableMap(labelsToNodes);
@@ -921,8 +922,8 @@ public class CommonNodeLabelsManager extends AbstractService {
    * @return existing valid labels in repository
    */
   public Set<String> getClusterNodeLabelNames() {
+    readLock.lock();
     try {
-      readLock.lock();
       Set<String> labels = new HashSet<String>(labelCollections.keySet());
       labels.remove(NO_LABEL);
       return Collections.unmodifiableSet(labels);
@@ -932,8 +933,8 @@ public class CommonNodeLabelsManager extends AbstractService {
   }
   
   public List<NodeLabel> getClusterNodeLabels() {
+    readLock.lock();
     try {
-      readLock.lock();
       List<NodeLabel> nodeLabels = new ArrayList<>();
       for (RMNodeLabel label : labelCollections.values()) {
         if (!label.getLabelName().equals(NO_LABEL)) {
@@ -951,8 +952,8 @@ public class CommonNodeLabelsManager extends AbstractService {
     if (nodeLabel.equals(NO_LABEL)) {
       return noNodeLabel.getIsExclusive();
     }
+    readLock.lock();
     try {
-      readLock.lock();
       RMNodeLabel label = labelCollections.get(nodeLabel);
       if (label == null) {
         String message =
@@ -1047,8 +1048,8 @@ public class CommonNodeLabelsManager extends AbstractService {
   }
   
   public Set<NodeLabel> getLabelsInfoByNode(NodeId nodeId) {
+    readLock.lock();
     try {
-      readLock.lock();
       Set<String> labels = getLabelsByNode(nodeId, nodeCollections);
       if (labels.isEmpty()) {
         return EMPTY_NODELABEL_SET;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
index 6c459c2739d..32e2268d01d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/FileSystemNodeLabelsStore.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.nodelabels;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -46,8 +46,8 @@ import java.util.Set;
 public class FileSystemNodeLabelsStore
     extends AbstractFSNodeStore<CommonNodeLabelsManager>
     implements NodeLabelsStore {
-  protected static final Log LOG =
-      LogFactory.getLog(FileSystemNodeLabelsStore.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(FileSystemNodeLabelsStore.class);
 
   protected static final String DEFAULT_DIR_NAME = "node-labels";
   protected static final String MIRROR_FILENAME = "nodelabel.mirror";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java
index 674703763ba..afacac73c2f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/NonAppendableFSNodeLabelStore.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.nodelabels;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.yarn.api.records.NodeId;
@@ -39,8 +39,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  * Store implementation for Non Appendable File Store.
  */
 public class NonAppendableFSNodeLabelStore extends FileSystemNodeLabelsStore {
-  protected static final Log
-      LOG = LogFactory.getLog(NonAppendableFSNodeLabelStore.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(NonAppendableFSNodeLabelStore.class);
 
   @Override
   public void close() throws IOException {
@@ -93,10 +93,10 @@ public class NonAppendableFSNodeLabelStore extends FileSystemNodeLabelsStore {
 
   private void writeNewMirror() throws IOException {
     ReentrantReadWriteLock.ReadLock readLock = manager.readLock;
+    // Acquire readlock to make sure we get cluster node labels and
+    // node-to-labels mapping atomically.
+    readLock.lock();
     try {
-      // Acquire readlock to make sure we get cluster node labels and
-      // node-to-labels mapping atomically.
-      readLock.lock();
       // Write mirror to mirror.new.tmp file
       Path newTmpPath = new Path(fsWorkingPath, MIRROR_FILENAME + ".new.tmp");
       try (FSDataOutputStream os = fs.create(newTmpPath, true)) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java
index 7127d112df3..d0fb837a2da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/store/AbstractFSNodeStore.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.nodelabels.store;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -40,7 +40,8 @@ import java.io.IOException;
  */
 public abstract class AbstractFSNodeStore<M> {
 
-  protected static final Log LOG = LogFactory.getLog(AbstractFSNodeStore.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(AbstractFSNodeStore.class);
 
   private StoreType storeType;
   private FSDataOutputStream editlogOs;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java
index ed83b062fd2..591c09f5be4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenIdentifier.java
@@ -25,8 +25,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
@@ -51,7 +51,8 @@ import com.google.protobuf.TextFormat;
 @Evolving
 public class AMRMTokenIdentifier extends TokenIdentifier {
 
-  private static final Log LOG = LogFactory.getLog(AMRMTokenIdentifier.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AMRMTokenIdentifier.class);
 
   public static final Text KIND_NAME = new Text("YARN_AM_RM_TOKEN");
   private AMRMTokenIdentifierProto proto;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java
index be3701d7048..a04133479a2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AMRMTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.io.Text;
@@ -34,8 +34,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class AMRMTokenSelector implements
     TokenSelector<AMRMTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(AMRMTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(AMRMTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   public Token<AMRMTokenIdentifier> selectToken(Text service,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java
index a386123e6a2..949c6a2e27c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
@@ -36,7 +36,8 @@ public class AdminACLsManager {
   /**
    * Log object for this class
    */
-  static Log LOG = LogFactory.getLog(AdminACLsManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AdminACLsManager.class);
 
   /**
    * The current user at the time of object creation
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java
index 36c52144f4d..615ecb0106e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java
@@ -57,8 +57,8 @@ public class ConfiguredYarnAuthorizer extends YarnAuthorizationProvider {
   @Override
   public void setPermission(List<Permission> permissions,
       UserGroupInformation user) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       for (Permission perm : permissions) {
         allAcls.put(perm.getTarget(), perm.getAcls());
       }
@@ -94,8 +94,8 @@ public class ConfiguredYarnAuthorizer extends YarnAuthorizationProvider {
 
   @Override
   public boolean checkPermission(AccessRequest accessRequest) {
+    readLock.lock();
     try {
-      readLock.lock();
       return checkPermissionInternal(accessRequest.getAccessType(),
           accessRequest.getEntity(), accessRequest.getUser());
     } finally {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
index 8dea65f5f95..7852b9c74df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
@@ -28,8 +28,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
@@ -68,7 +68,8 @@ import com.google.protobuf.TextFormat;
 @Evolving
 public class ContainerTokenIdentifier extends TokenIdentifier {
 
-  private static Log LOG = LogFactory.getLog(ContainerTokenIdentifier.class);
+  private final static Logger LOG =
+      LoggerFactory.getLogger(ContainerTokenIdentifier.class);
 
   public static final Text KIND = new Text("ContainerToken");
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java
index a1c0a914025..65c59ac825c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Stable;
 import org.apache.hadoop.io.Text;
@@ -34,8 +34,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class ContainerTokenSelector implements
     TokenSelector<ContainerTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(ContainerTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(ContainerTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java
index cd1ad03f5f2..1a7323f875e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenIdentifier.java
@@ -25,8 +25,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.io.IOUtils;
@@ -46,7 +46,8 @@ import com.google.protobuf.TextFormat;
 @Evolving
 public class NMTokenIdentifier extends TokenIdentifier {
 
-  private static Log LOG = LogFactory.getLog(NMTokenIdentifier.class);
+  private final static Logger LOG =
+      LoggerFactory.getLogger(NMTokenIdentifier.class);
 
   public static final Text KIND = new Text("NMToken");
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java
index 43899b5aa51..ecc65c595de 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
@@ -30,8 +30,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class NMTokenSelector implements
     TokenSelector<NMTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(NMTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(NMTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java
index 9ae4bd7da4c..7f39fa45a5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.security;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -41,7 +41,8 @@ import java.util.List;
 @Unstable
 public abstract class YarnAuthorizationProvider {
 
-  private static final Log LOG = LogFactory.getLog(YarnAuthorizationProvider.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(YarnAuthorizationProvider.class);
 
   private static YarnAuthorizationProvider authorizer = null;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java
index e102fb2e436..5718965df5b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/ClientToAMTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security.client;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
@@ -30,8 +30,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class ClientToAMTokenSelector implements
     TokenSelector<ClientToAMTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(ClientToAMTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(ClientToAMTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   public Token<ClientToAMTokenIdentifier> selectToken(Text service,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
index 9ab2d766ac3..cfeb62f2058 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/RMDelegationTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security.client;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Stable;
 import org.apache.hadoop.io.Text;
@@ -34,8 +34,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class RMDelegationTokenSelector implements
     TokenSelector<RMDelegationTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(RMDelegationTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMDelegationTokenSelector.class);
 
   private boolean checkService(Text service,
       Token<? extends TokenIdentifier> token) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java
index 252dfa12bb3..b75f288642e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/client/TimelineDelegationTokenSelector.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.security.client;
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.io.Text;
@@ -34,8 +34,8 @@ import org.apache.hadoop.security.token.TokenSelector;
 public class TimelineDelegationTokenSelector
     implements TokenSelector<TimelineDelegationTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-      .getLog(TimelineDelegationTokenSelector.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TimelineDelegationTokenSelector.class);
 
   @SuppressWarnings("unchecked")
   public Token<TimelineDelegationTokenIdentifier> selectToken(Text service,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java
index 97b41633872..8cf34e983c1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/security/ApplicationACLsManager.java
@@ -23,8 +23,8 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.AccessControlException;
@@ -40,8 +40,8 @@ import com.google.common.annotations.VisibleForTesting;
 @InterfaceAudience.Private
 public class ApplicationACLsManager {
 
-  private static final Log LOG = LogFactory
-      .getLog(ApplicationACLsManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(ApplicationACLsManager.class);
 
   private static AccessControlList DEFAULT_YARN_APP_ACL 
     = new AccessControlList(YarnConfiguration.DEFAULT_YARN_APP_ACL);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java
index 638128e4bf7..688c7c8d929 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.service.AbstractService;
@@ -37,7 +37,8 @@ import org.apache.hadoop.service.AbstractService;
 @Evolving
 public abstract class AbstractLivelinessMonitor<O> extends AbstractService {
 
-  private static final Log LOG = LogFactory.getLog(AbstractLivelinessMonitor.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractLivelinessMonitor.class);
 
   //thread which runs periodically to see the last time since a heartbeat is
   //received.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java
index f33ddcdb839..74ee5fca95e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AdHocLogDumper.java
@@ -18,25 +18,34 @@
 
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Priority;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
-import org.apache.log4j.*;
 
 import com.google.common.annotations.VisibleForTesting;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
 
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public class AdHocLogDumper {
 
-  private static final Log LOG = LogFactory.getLog(AdHocLogDumper.class);
+  private static final Logger LOG =
+      LogManager.getLogger(AdHocLogDumper.class);
 
   private String name;
   private String targetFilename;
@@ -54,58 +63,53 @@ public class AdHocLogDumper {
 
   public void dumpLogs(String level, int timePeriod)
       throws YarnRuntimeException, IOException {
-    synchronized (lock) {
+    synchronized (lock){
       if (logFlag) {
         LOG.info("Attempt to dump logs when appender is already running");
         throw new YarnRuntimeException("Appender is already dumping logs");
       }
       Level targetLevel = Level.toLevel(level);
-      Log log = LogFactory.getLog(name);
+      Logger logger = LogManager.getLogger(name);
       appenderLevels.clear();
-      if (log instanceof Log4JLogger) {
-        Logger packageLogger = ((Log4JLogger) log).getLogger();
-        currentLogLevel = packageLogger.getLevel();
-        Level currentEffectiveLevel = packageLogger.getEffectiveLevel();
+      currentLogLevel = logger.getLevel();
+      Level currentEffectiveLevel = logger.getEffectiveLevel();
 
-        // make sure we can create the appender first
-        Layout layout = new PatternLayout("%d{ISO8601} %p %c: %m%n");
-        FileAppender fApp;
-        File file =
-            new File(System.getProperty("yarn.log.dir"), targetFilename);
-        try {
-          fApp = new FileAppender(layout, file.getAbsolutePath(), false);
-        } catch (IOException ie) {
-          LOG
-            .warn(
-              "Error creating file, can't dump logs to "
-                  + file.getAbsolutePath(), ie);
-          throw ie;
-        }
-        fApp.setName(AdHocLogDumper.AD_HOC_DUMPER_APPENDER);
-        fApp.setThreshold(targetLevel);
-
-        // get current threshold of all appenders and set it to the effective
-        // level
-        for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders
-          .hasMoreElements();) {
-          Object obj = appenders.nextElement();
-          if (obj instanceof AppenderSkeleton) {
-            AppenderSkeleton appender = (AppenderSkeleton) obj;
-            appenderLevels.put(appender.getName(), appender.getThreshold());
-            appender.setThreshold(currentEffectiveLevel);
-          }
-        }
-
-        packageLogger.addAppender(fApp);
-        LOG.info("Dumping adhoc logs for " + name + " to "
-            + file.getAbsolutePath() + " for " + timePeriod + " milliseconds");
-        packageLogger.setLevel(targetLevel);
-        logFlag = true;
-
-        TimerTask restoreLogLevel = new RestoreLogLevel();
-        Timer restoreLogLevelTimer = new Timer();
-        restoreLogLevelTimer.schedule(restoreLogLevel, timePeriod);
+      // make sure we can create the appender first
+      Layout layout = new PatternLayout("%d{ISO8601} %p %c: %m%n");
+      FileAppender fApp;
+      File file =
+          new File(System.getProperty("yarn.log.dir"), targetFilename);
+      try {
+        fApp = new FileAppender(layout, file.getAbsolutePath(), false);
+      } catch (IOException ie) {
+        LOG.warn("Error creating file, can't dump logs to "
+            + file.getAbsolutePath(), ie);
+        throw ie;
       }
+      fApp.setName(AdHocLogDumper.AD_HOC_DUMPER_APPENDER);
+      fApp.setThreshold(targetLevel);
+
+      // get current threshold of all appenders and set it to the effective
+      // level
+      for (Enumeration appenders = Logger.getRootLogger().getAllAppenders();
+          appenders.hasMoreElements();) {
+        Object obj = appenders.nextElement();
+        if (obj instanceof AppenderSkeleton) {
+          AppenderSkeleton appender = (AppenderSkeleton) obj;
+          appenderLevels.put(appender.getName(), appender.getThreshold());
+          appender.setThreshold(currentEffectiveLevel);
+        }
+      }
+
+      logger.addAppender(fApp);
+      LOG.info("Dumping adhoc logs for " + name + " to "
+          + file.getAbsolutePath() + " for " + timePeriod + " milliseconds");
+      logger.setLevel(targetLevel);
+      logFlag = true;
+
+      TimerTask restoreLogLevel = new RestoreLogLevel();
+      Timer restoreLogLevelTimer = new Timer();
+      restoreLogLevelTimer.schedule(restoreLogLevel, timePeriod);
     }
   }
 
@@ -117,22 +121,19 @@ public class AdHocLogDumper {
   class RestoreLogLevel extends TimerTask {
     @Override
     public void run() {
-      Log log = LogFactory.getLog(name);
-      if (log instanceof Log4JLogger) {
-        Logger logger = ((Log4JLogger) log).getLogger();
-        logger.removeAppender(AD_HOC_DUMPER_APPENDER);
-        logger.setLevel(currentLogLevel);
-        for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders
-          .hasMoreElements();) {
-          Object obj = appenders.nextElement();
-          if (obj instanceof AppenderSkeleton) {
-            AppenderSkeleton appender = (AppenderSkeleton) obj;
-            appender.setThreshold(appenderLevels.get(appender.getName()));
-          }
+      Logger logger = LogManager.getLogger(name);
+      logger.removeAppender(AD_HOC_DUMPER_APPENDER);
+      logger.setLevel(currentLogLevel);
+      for (Enumeration appenders = Logger.getRootLogger().getAllAppenders();
+          appenders.hasMoreElements();) {
+        Object obj = appenders.nextElement();
+        if (obj instanceof AppenderSkeleton) {
+          AppenderSkeleton appender = (AppenderSkeleton) obj;
+          appender.setThreshold(appenderLevels.get(appender.getName()));
         }
-        logFlag = false;
-        LOG.info("Done dumping adhoc logs for " + name);
       }
+      logFlag = false;
+      LOG.info("Done dumping adhoc logs for " + name);
     }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java
index d203f65b93d..08a5724960e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java
@@ -32,8 +32,8 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
@@ -66,7 +66,8 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
 @LimitedPrivate({"YARN", "MapReduce"})
 public class FSDownload implements Callable<Path> {
 
-  private static final Log LOG = LogFactory.getLog(FSDownload.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FSDownload.class);
 
   private FileContext files;
   private final UserGroupInformation userUgi;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
index e8b6533fca1..0bfd40beec7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
@@ -44,8 +44,8 @@ import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -61,8 +61,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 @InterfaceStability.Unstable
 public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree {
 
-  static final Log LOG = LogFactory
-      .getLog(ProcfsBasedProcessTree.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(ProcfsBasedProcessTree.class);
 
   private static final String PROCFS = "/proc/";
 
@@ -264,7 +264,7 @@ public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree {
         }
       }
 
-      LOG.debug(this);
+      LOG.debug(this.toString());
 
       if (smapsEnabled) {
         // Update smaps info
@@ -409,8 +409,8 @@ public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree {
                     + ", total : " + (total * KB_TO_BYTES));
               }
             }
+            LOG.debug(procMemInfo.toString());
           }
-          LOG.debug(procMemInfo);
         }
       }
     }
@@ -807,11 +807,11 @@ public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree {
         }
       }
     } catch (FileNotFoundException f) {
-      LOG.error(f);
+      LOG.error(f.toString());
     } catch (IOException e) {
-      LOG.error(e);
+      LOG.error(e.toString());
     } catch (Throwable t) {
-      LOG.error(t);
+      LOG.error(t.toString());
     } finally {
       IOUtils.closeQuietly(in);
     }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/RackResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/RackResolver.java
index a85470155a4..07ddbe953a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/RackResolver.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/RackResolver.java
@@ -18,9 +18,11 @@
 
 package org.apache.hadoop.yarn.util;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.base.Strings;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
@@ -86,6 +88,20 @@ public final class RackResolver {
     return coreResolve(hostName);
   }
 
+  /**
+   * Utility method for getting a list of hostname resolved to a list of node
+   *  in the network topology. This method initializes the class with the
+   * right resolver implementation.
+   * @param conf
+   * @param hostNames
+   * @return nodes {@link Node} after resolving the hostnames
+   */
+  public static List<Node> resolve(
+      Configuration conf, List<String> hostNames) {
+    init(conf);
+    return coreResolve(hostNames);
+  }
+
   /**
    * Utility method for getting a hostname resolved to a node in the
    * network topology. This method doesn't initialize the class.
@@ -100,18 +116,50 @@ public final class RackResolver {
     return coreResolve(hostName);
   }
 
+  /**
+   * Utility method for getting a list of hostname resolved to a list of node
+   *  in the network topology. This method doesn't initialize the class.
+   * Call {@link #init(Configuration)} explicitly.
+   * @param hostNames
+   * @return nodes {@link Node} after resolving the hostnames
+   */
+  public static List<Node> resolve(List<String> hostNames) {
+    if (!initCalled) {
+      throw new IllegalStateException("RackResolver class " +
+          "not yet initialized");
+    }
+    return coreResolve(hostNames);
+  }
+
   private static Node coreResolve(String hostName) {
     List <String> tmpList = Collections.singletonList(hostName);
-    List <String> rNameList = dnsToSwitchMapping.resolve(tmpList);
-    String rName = NetworkTopology.DEFAULT_RACK;
-    if (rNameList == null || rNameList.get(0) == null) {
-      LOG.debug("Could not resolve {}. Falling back to {}", hostName,
-            NetworkTopology.DEFAULT_RACK);
+    return coreResolve(tmpList).get(0);
+  }
+
+  private static List<Node> coreResolve(List<String> hostNames) {
+    List<Node> nodes = new ArrayList<Node>(hostNames.size());
+    List<String> rNameList = dnsToSwitchMapping.resolve(hostNames);
+    if (rNameList == null || rNameList.isEmpty()) {
+      for (String hostName : hostNames) {
+        nodes.add(new NodeBase(hostName, NetworkTopology.DEFAULT_RACK));
+      }
+      LOG.info("Got an error when resolve hostNames. Falling back to "
+          + NetworkTopology.DEFAULT_RACK + " for all.");
     } else {
-      rName = rNameList.get(0);
-      LOG.debug("Resolved {} to {}", hostName, rName);
+      for (int i = 0; i < hostNames.size(); i++) {
+        if (Strings.isNullOrEmpty(rNameList.get(i))) {
+          // fallback to use default rack
+          nodes.add(new NodeBase(hostNames.get(i),
+              NetworkTopology.DEFAULT_RACK));
+          LOG.debug("Could not resolve {}. Falling back to {}",
+              hostNames.get(i), NetworkTopology.DEFAULT_RACK);
+        } else {
+          nodes.add(new NodeBase(hostNames.get(i), rNameList.get(i)));
+          LOG.debug("Resolved {} to {}", hostNames.get(i), rNameList.get(i));
+        }
+      }
     }
-    return new NodeBase(hostName, rName);
+    return nodes;
   }
 
   /**
@@ -122,4 +170,14 @@ public final class RackResolver {
   static DNSToSwitchMapping getDnsToSwitchMapping() {
     return dnsToSwitchMapping;
   }
+
+  /**
+   * Only used by tests.
+   */
+  @Private
+  @VisibleForTesting
+  static void reset() {
+    initCalled = false;
+    dnsToSwitchMapping = null;
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
index fd63d9852c4..5fcc474652f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorPlugin.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -33,8 +33,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 @InterfaceAudience.LimitedPrivate({"YARN", "MAPREDUCE"})
 @InterfaceStability.Unstable
 public class ResourceCalculatorPlugin extends Configured {
-  private static final Log LOG =
-      LogFactory.getLog(ResourceCalculatorPlugin.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ResourceCalculatorPlugin.class);
 
   private final SysInfo sys;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
index c581b83cf3f..9bbec5f9d7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.util;
 
 import java.lang.reflect.Constructor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
@@ -38,8 +38,8 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
 @Public
 @Evolving
 public abstract class ResourceCalculatorProcessTree extends Configured {
-  static final Log LOG = LogFactory
-      .getLog(ResourceCalculatorProcessTree.class);
+  static final Logger LOG = LoggerFactory
+      .getLogger(ResourceCalculatorProcessTree.class);
   public static final int UNAVAILABLE = -1;
 
   /**
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
index 3c415586274..b6604eee125 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
@@ -22,13 +22,14 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 
 @Private
 public class Times {
-  private static final Log LOG = LogFactory.getLog(Times.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(Times.class);
 
   static final String ISO8601DATEFORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java
index b4e5456d419..d7a92f0dbe8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsBasedProcessTree.java
@@ -23,8 +23,8 @@ import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.util.CpuTimeTracker;
 import org.apache.hadoop.util.Shell;
@@ -34,8 +34,8 @@ import org.apache.hadoop.util.StringUtils;
 @Private
 public class WindowsBasedProcessTree extends ResourceCalculatorProcessTree {
 
-  static final Log LOG = LogFactory
-      .getLog(WindowsBasedProcessTree.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(WindowsBasedProcessTree.class);
 
   static class ProcessInfo {
     String pid; // process pid
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java
index e515321aa49..c6399d9b880 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/YarnVersionInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.util.VersionInfo;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -30,7 +30,8 @@ import org.apache.hadoop.classification.InterfaceStability;
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public class YarnVersionInfo extends VersionInfo {
-  private static final Log LOG = LogFactory.getLog(YarnVersionInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(YarnVersionInfo.class);
 
   private static YarnVersionInfo YARN_VERSION_INFO = new YarnVersionInfo();
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java
index 9a3f7037ee7..61b1a87e5a4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java
@@ -17,8 +17,8 @@
 */
 package org.apache.hadoop.yarn.util.resource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -26,8 +26,8 @@ import org.apache.hadoop.yarn.api.records.Resource;
 @Private
 @Unstable
 public class DefaultResourceCalculator extends ResourceCalculator {
-  private static final Log LOG =
-      LogFactory.getLog(DefaultResourceCalculator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DefaultResourceCalculator.class);
 
   @Override
   public int compare(Resource unused, Resource lhs, Resource rhs,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java
index 17244e9eef5..16176ef9303 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java
@@ -17,8 +17,8 @@
 */
 package org.apache.hadoop.yarn.util.resource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -53,7 +53,8 @@ import java.util.Arrays;
 @Private
 @Unstable
 public class DominantResourceCalculator extends ResourceCalculator {
-  static final Log LOG = LogFactory.getLog(DominantResourceCalculator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DominantResourceCalculator.class);
 
   public DominantResourceCalculator() {
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
index 40d8d38ec1c..9b96fd72b9a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.util.resource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -37,8 +37,8 @@ public class Resources {
 
   private enum RoundingDirection { UP, DOWN }
 
-  private static final Log LOG =
-      LogFactory.getLog(Resources.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(Resources.class);
 
   /**
    * Helper class to create a resource with a fixed value for all resource
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java
index 8946e2d9ca1..0ada51a93c2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/GenericExceptionHandler.java
@@ -28,8 +28,8 @@ import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 import javax.xml.bind.UnmarshalException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.security.authorize.AuthorizationException;
@@ -44,8 +44,8 @@ import com.google.inject.Singleton;
 @Singleton
 @Provider
 public class GenericExceptionHandler implements ExceptionMapper<Exception> {
-  public static final Log LOG = LogFactory
-      .getLog(GenericExceptionHandler.class);
+  public static final Logger LOG = LoggerFactory
+      .getLogger(GenericExceptionHandler.class);
 
   private @Context
   HttpServletResponse response;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 1a5c35a84b6..99105c8aebb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -3960,6 +3960,33 @@
     <value>auto</value>
   </property>
 
+  <property>
+    <description>
+      Absolute path to a script or executable that returns the available FPGA cards.
+      The returned string must be a single line and follow the format:
+      "deviceA/N:M,deviceB/X:Y". Example: "acl0/243:0,acl1/243:1". The numbers after
+      the "/" character are the device major and minor numbers.
+
+      When the script is enabled, auto-discovery is disabled the "aocl" command is not
+      invoked to verify the available cards.
+    </description>
+    <name>yarn.nodemanager.resource-plugins.fpga.device-discovery-script</name>
+    <value></value>
+  </property>
+
+  <property>
+    <description>
+      List of FPGA available devices in the given node.
+      The value must follow the format: "deviceA/N:M,deviceB/X:Y".
+      Example: "acl0/243:0,acl1/243:1". The numbers after
+      the "/" character are the device major and minor numbers.
+
+      When this property is used, both auto-discovery and external script are ignored.
+    </description>
+    <name>yarn.nodemanager.resource-plugins.fpga.available-devices</name>
+    <value></value>
+  </property>
+
   <property>
     <description>The http address of the timeline reader web application.</description>
     <name>yarn.timeline-service.reader.webapp.address</name>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java
index 34e21984807..279a37b7d19 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java
@@ -24,8 +24,8 @@ import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.net.NetUtils;
@@ -79,7 +79,8 @@ import org.junit.Test;
  */
 public class TestContainerLaunchRPC {
 
-  static final Log LOG = LogFactory.getLog(TestContainerLaunchRPC.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestContainerLaunchRPC.class);
 
   private static final RecordFactory recordFactory = RecordFactoryProvider
       .getRecordFactory(null);
@@ -171,7 +172,7 @@ public class TestContainerLaunchRPC {
         // make the thread sleep to look like its not going to respond
         Thread.sleep(10000);
       } catch (Exception e) {
-        LOG.error(e);
+        LOG.error(e.toString());
         throw new YarnException(e);
       }
       throw new YarnException("Shouldn't happen!!");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java
index 1690b815d41..c3dac914672 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerResourceIncreaseRPC.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.net.NetUtils;
@@ -74,7 +74,7 @@ import java.util.List;
  */
 public class TestContainerResourceIncreaseRPC {
 
-  static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       TestContainerResourceIncreaseRPC.class);
 
   @Test
@@ -188,7 +188,7 @@ public class TestContainerResourceIncreaseRPC {
         // make the thread sleep to look like its not going to respond
         Thread.sleep(10000);
       } catch (Exception e) {
-        LOG.error(e);
+        LOG.error(e.toString());
         throw new YarnException(e);
       }
       throw new YarnException("Shouldn't happen!!");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java
index bbb784031a1..25eb9e1454a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java
@@ -21,8 +21,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.Range;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.resource.PlacementConstraint;
 import org.apache.hadoop.yarn.api.resource.PlacementConstraints;
 import org.junit.Assert;
@@ -40,7 +40,8 @@ import static org.apache.hadoop.yarn.api.resource.PlacementConstraints.targetIn;
  * Generic helper class to validate protocol records.
  */
 public class BasePBImplRecordsTest {
-  static final Log LOG = LogFactory.getLog(BasePBImplRecordsTest.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BasePBImplRecordsTest.class);
 
   @SuppressWarnings("checkstyle:visibilitymodifier")
   protected static HashMap<Type, Object> typeValueCache =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java
index 9d16edb7163..0de8200d63b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timeline/TestTimelineRecords.java
@@ -27,8 +27,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.WeakHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse.TimelinePutError;
 import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 import org.junit.Assert;
@@ -36,8 +36,8 @@ import org.junit.Test;
 
 public class TestTimelineRecords {
 
-  private static final Log LOG =
-      LogFactory.getLog(TestTimelineRecords.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestTimelineRecords.class);
 
   @Test
   public void testEntities() throws Exception {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java
index 221969bdd65..b488a652ae2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineServiceRecords.java
@@ -18,8 +18,8 @@
 package org.apache.hadoop.yarn.api.records.timelineservice;
 
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -36,8 +36,8 @@ import java.util.Map;
 
 
 public class TestTimelineServiceRecords {
-  private static final Log LOG =
-      LogFactory.getLog(TestTimelineServiceRecords.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestTimelineServiceRecords.class);
 
   @Test
   public void testTimelineEntities() throws Exception {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java
index 76e5714f525..26dd7f42bc5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientForATS1_5.java
@@ -30,8 +30,8 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileContext;
 import org.apache.hadoop.fs.Path;
@@ -52,8 +52,8 @@ import com.sun.jersey.api.client.ClientResponse;
 
 public class TestTimelineClientForATS1_5 {
 
-  protected static Log LOG = LogFactory
-    .getLog(TestTimelineClientForATS1_5.class);
+  private final static Logger LOG = LoggerFactory
+      .getLogger(TestTimelineClientForATS1_5.class);
 
   private TimelineClientImpl client;
   private static FileContext localFS;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java
index 95595a9f4c4..6770c07fca4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClientV2Impl.java
@@ -30,8 +30,8 @@ import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -50,8 +50,8 @@ import org.junit.Test;
 import org.junit.rules.TestName;
 
 public class TestTimelineClientV2Impl {
-  private static final Log LOG =
-      LogFactory.getLog(TestTimelineClientV2Impl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestTimelineClientV2Impl.class);
   private TestV2TimelineClient client;
   private static final long TIME_TO_SLEEP = 150L;
   private static final String EXCEPTION_MSG = "Exception in the content";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java
index 6aa56d82134..cd6274afd0d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/event/InlineDispatcher.java
@@ -18,15 +18,16 @@
 
 package org.apache.hadoop.yarn.event;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.event.AsyncDispatcher;
 import org.apache.hadoop.yarn.event.Event;
 import org.apache.hadoop.yarn.event.EventHandler;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class InlineDispatcher extends AsyncDispatcher {
-  private static final Log LOG = LogFactory.getLog(InlineDispatcher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(InlineDispatcher.class);
 
   private class TestEventHandler implements EventHandler {
     @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
index f85445ed68e..6c26c402902 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java
@@ -38,8 +38,8 @@ import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 
 import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FileStatus;
@@ -70,8 +70,8 @@ public class TestAggregatedLogFormat {
   private static final Configuration conf = new Configuration();
   private static final FileSystem fs;
   private static final char filler = 'x';
-  private static final Log LOG = LogFactory
-      .getLog(TestAggregatedLogFormat.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestAggregatedLogFormat.class);
 
   static {
     try {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java
index 046c94e5d45..4b2545e812c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestAdHocLogDumper.java
@@ -18,14 +18,14 @@
 
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4JLogger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.util.Time;
 import org.apache.log4j.Appender;
 import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
+import org.apache.log4j.LogManager;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -34,20 +34,22 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.apache.hadoop.util.GenericsUtil.isLog4jLogger;
+
 public class TestAdHocLogDumper {
 
-  private static final Log LOG = LogFactory.getLog(TestAdHocLogDumper.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestAdHocLogDumper.class);
 
   @Test
   public void testDumpingSchedulerLogs() throws Exception {
 
     Map<Appender, Priority> levels = new HashMap<>();
-    String logHierarchy = TestAdHocLogDumper.class.getName();
     String logFilename = "test.log";
-    Log log = LogFactory.getLog(logHierarchy);
-    if (log instanceof Log4JLogger) {
-      for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders
-        .hasMoreElements();) {
+    Logger logger = LoggerFactory.getLogger(TestAdHocLogDumper.class);
+    if (isLog4jLogger(this.getClass())) {
+      for (Enumeration appenders = LogManager.getRootLogger().
+          getAllAppenders(); appenders.hasMoreElements();) {
         Object obj = appenders.nextElement();
         if (obj instanceof AppenderSkeleton) {
           AppenderSkeleton appender = (AppenderSkeleton) obj;
@@ -56,7 +58,8 @@ public class TestAdHocLogDumper {
       }
     }
 
-    AdHocLogDumper dumper = new AdHocLogDumper(logHierarchy, logFilename);
+    AdHocLogDumper dumper = new AdHocLogDumper(this.getClass().getName(),
+        logFilename);
     dumper.dumpLogs("DEBUG", 1000);
     LOG.debug("test message 1");
     LOG.info("test message 2");
@@ -68,9 +71,9 @@ public class TestAdHocLogDumper {
     Assert.assertTrue(logFile.length() != 0);
 
     // make sure levels are set back to their original values
-    if (log instanceof Log4JLogger) {
-      for (Enumeration appenders = Logger.getRootLogger().getAllAppenders(); appenders
-        .hasMoreElements();) {
+    if (isLog4jLogger(this.getClass())) {
+      for (Enumeration appenders = LogManager.getRootLogger().
+          getAllAppenders(); appenders.hasMoreElements();) {
         Object obj = appenders.nextElement();
         if (obj instanceof AppenderSkeleton) {
           AppenderSkeleton appender = (AppenderSkeleton) obj;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java
index 08d6189289d..678687fa582 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestFSDownload.java
@@ -58,8 +58,8 @@ import org.junit.Assert;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -87,7 +87,8 @@ import com.google.common.cache.LoadingCache;
  */
 public class TestFSDownload {
 
-  private static final Log LOG = LogFactory.getLog(TestFSDownload.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestFSDownload.class);
   private static AtomicLong uniqueNumberGenerator =
     new AtomicLong(System.currentTimeMillis());
   private enum TEST_FILE_TYPE {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
index e788e80660f..46c891a55bd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
@@ -18,14 +18,17 @@
 
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.util.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.apache.log4j.LogManager;
 import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.hadoop.util.Time;
 import org.junit.Assert;
 import org.junit.Test;
 
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +36,10 @@ import java.util.Map;
 public class TestLog4jWarningErrorMetricsAppender {
 
   Log4jWarningErrorMetricsAppender appender;
-  Log logger = LogFactory.getLog(TestLog4jWarningErrorMetricsAppender.class);
+  private static final Logger LOG = LoggerFactory.
+      getLogger(TestLog4jWarningErrorMetricsAppender.class);
+  private static final Marker FATAL =
+      MarkerFactory.getMarker("FATAL");
   List<Long> cutoff = new ArrayList<>();
 
   void setupAppender(int cleanupIntervalSeconds, long messageAgeLimitSeconds,
@@ -42,33 +48,33 @@ public class TestLog4jWarningErrorMetricsAppender {
     appender =
         new Log4jWarningErrorMetricsAppender(cleanupIntervalSeconds,
           messageAgeLimitSeconds, maxUniqueMessages);
-    Logger.getRootLogger().addAppender(appender);
+    LogManager.getRootLogger().addAppender(appender);
   }
 
   void removeAppender() {
-    Logger.getRootLogger().removeAppender(appender);
+    LogManager.getRootLogger().removeAppender(appender);
   }
 
   void logMessages(Level level, String message, int count) {
     for (int i = 0; i < count; ++i) {
       switch (level.toInt()) {
       case Level.FATAL_INT:
-        logger.fatal(message);
+        LOG.error(FATAL, message);
         break;
       case Level.ERROR_INT:
-        logger.error(message);
+        LOG.error(message);
         break;
       case Level.WARN_INT:
-        logger.warn(message);
+        LOG.warn(message);
         break;
       case Level.INFO_INT:
-        logger.info(message);
+        LOG.info(message);
         break;
       case Level.DEBUG_INT:
-        logger.debug(message);
+        LOG.debug(message);
         break;
       case Level.TRACE_INT:
-        logger.trace(message);
+        LOG.trace(message);
         break;
       }
     }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
index 7349d22a1ec..56baa899dac 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java
@@ -38,8 +38,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileContext;
 import org.apache.hadoop.fs.FileUtil;
@@ -61,8 +61,8 @@ import org.junit.Test;
  */
 public class TestProcfsBasedProcessTree {
 
-  private static final Log LOG = LogFactory
-    .getLog(TestProcfsBasedProcessTree.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestProcfsBasedProcessTree.class);
   protected static File TEST_ROOT_DIR = new File("target",
     TestProcfsBasedProcessTree.class.getName() + "-localDir");
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
index 70ca23c3a2e..4b1d7921fdb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
@@ -21,23 +21,30 @@ package org.apache.hadoop.yarn.util;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.net.DNSToSwitchMapping;
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.net.Node;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 public class TestRackResolver {
 
-  private static Log LOG = LogFactory.getLog(TestRackResolver.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestRackResolver.class);
   private static final String invalidHost = "invalidHost";
 
+  @Before
+  public void setUp() {
+    RackResolver.reset();
+  }
 
   public static final class MyResolver implements DNSToSwitchMapping {
 
@@ -81,6 +88,44 @@ public class TestRackResolver {
     }
   }
 
+  /**
+   * This class is to test the resolve method which accepts a list of hosts
+   * in RackResolver.
+   */
+  public static final class MultipleResolver implements DNSToSwitchMapping {
+
+    @Override
+    public List<String> resolve(List<String> hostList) {
+      List<String> returnList = new ArrayList<String>();
+      if (hostList.isEmpty()) {
+        return returnList;
+      }
+      for (String host : hostList) {
+        if (host.equals(invalidHost)) {
+          // Simulate condition where resolving host returns empty string
+          returnList.add("");
+        }
+        LOG.info("Received resolve request for " + host);
+        if (host.startsWith("host")) {
+          returnList.add("/" + host.replace("host", "rack"));
+        }
+        // I should not be reached again as RackResolver is supposed to do
+        // caching.
+      }
+      Assert.assertEquals(returnList.size(), hostList.size());
+      return returnList;
+    }
+
+    @Override
+    public void reloadCachedMappings() {
+      // nothing to do here, since RawScriptBasedMapping has no cache.
+    }
+
+    @Override
+    public void reloadCachedMappings(List<String> names) {
+    }
+  }
+
   @Test
   public void testCaching() {
     Configuration conf = new Configuration();
@@ -102,4 +147,20 @@ public class TestRackResolver {
     Assert.assertEquals(NetworkTopology.DEFAULT_RACK, node.getNetworkLocation());
   }
 
+  @Test
+  public void testMultipleHosts() {
+    Configuration conf = new Configuration();
+    conf.setClass(
+        CommonConfigurationKeysPublic
+            .NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
+        MultipleResolver.class,
+        DNSToSwitchMapping.class);
+    RackResolver.init(conf);
+    List<Node> nodes = RackResolver.resolve(
+        Arrays.asList("host1", invalidHost, "host2"));
+    Assert.assertEquals("/rack1", nodes.get(0).getNetworkLocation());
+    Assert.assertEquals(NetworkTopology.DEFAULT_RACK,
+        nodes.get(1).getNetworkLocation());
+    Assert.assertEquals("/rack2", nodes.get(2).getNetworkLocation());
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java
index d3cba646e22..db5d4bea940 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestWindowsBasedProcessTree.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -27,8 +27,8 @@ import static org.apache.hadoop.test.PlatformAssumptions.assumeWindows;
 import static org.junit.Assert.assertTrue;
 
 public class TestWindowsBasedProcessTree {
-  private static final Log LOG = LogFactory
-      .getLog(TestWindowsBasedProcessTree.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestWindowsBasedProcessTree.class);
 
   class WindowsBasedProcessTreeTester extends WindowsBasedProcessTree {
     String infoStr = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java
index 62d8769a6b7..cc277ed24af 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java
@@ -250,6 +250,7 @@ public class ApplicationHistoryManagerOnTimelineStore extends AbstractService
     String type = null;
     boolean unmanagedApplication = false;
     long createdTime = 0;
+    long launchTime = 0;
     long submittedTime = 0;
     long finishedTime = 0;
     float progress = 0.0f;
@@ -378,6 +379,9 @@ public class ApplicationHistoryManagerOnTimelineStore extends AbstractService
         if (event.getEventType().equals(
             ApplicationMetricsConstants.CREATED_EVENT_TYPE)) {
           createdTime = event.getTimestamp();
+        } else if (event.getEventType().equals(
+            ApplicationMetricsConstants.LAUNCHED_EVENT_TYPE)) {
+          launchTime = event.getTimestamp();
         } else if (event.getEventType().equals(
             ApplicationMetricsConstants.UPDATED_EVENT_TYPE)) {
           // This type of events are parsed in time-stamp descending order
@@ -454,7 +458,8 @@ public class ApplicationHistoryManagerOnTimelineStore extends AbstractService
     return new ApplicationReportExt(ApplicationReport.newInstance(
         ApplicationId.fromString(entity.getEntityId()),
         latestApplicationAttemptId, user, queue, name, null, -1, null, state,
-        diagnosticsInfo, null, createdTime, submittedTime, 0, finishedTime,
+        diagnosticsInfo, null, createdTime,
+        submittedTime, launchTime, finishedTime,
         finalStatus, appResources, null, progress, type, null, appTags,
         unmanagedApplication, Priority.newInstance(applicationPriority),
         appNodeLabelExpression, amNodeLabelExpression), appViewACLs);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java
new file mode 100644
index 00000000000..67668a9b367
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/ContextFactory.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp;
+
+import java.util.Map;
+import java.lang.reflect.Method;
+import javax.xml.bind.JAXBContext;
+
+/**
+ * ContextFactory to reuse JAXBContextImpl for DAO Classes.
+ */
+public final class ContextFactory {
+
+  private static JAXBContext jaxbContext;
+
+  private ContextFactory() {
+  }
+
+  // Called from WebComponent.service
+  public static JAXBContext createContext(Class[] classes,
+      Map<String, Object> properties) throws Exception {
+    synchronized (ContextFactory.class) {
+      if (jaxbContext == null) {
+        Class spFactory = Class.forName(
+            "com.sun.xml.internal.bind.v2.ContextFactory");
+        Method m = spFactory.getMethod("createContext", Class[].class,
+            Map.class);
+        jaxbContext = (JAXBContext) m.invoke((Object) null, classes,
+            properties);
+      }
+    }
+    return jaxbContext;
+  }
+
+  // Called from WebComponent.init
+  public static JAXBContext createContext(String contextPath, ClassLoader
+      classLoader, Map<String, Object> properties) throws Exception {
+    Class spFactory = Class.forName(
+        "com.sun.xml.internal.bind.v2.ContextFactory");
+    Method m = spFactory.getMethod("createContext", String.class,
+        ClassLoader.class, Map.class);
+    return (JAXBContext) m.invoke(null, contextPath, classLoader,
+        properties);
+  }
+
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java
index e3db1dcc28a..c9ce9367705 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/LeveldbTimelineStore.java
@@ -986,8 +986,8 @@ public class LeveldbTimelineStore extends AbstractService
 
   @Override
   public TimelinePutResponse put(TimelineEntities entities) {
+    deleteLock.readLock().lock();
     try {
-      deleteLock.readLock().lock();
       TimelinePutResponse response = new TimelinePutResponse();
       for (TimelineEntity entity : entities.getEntities()) {
         put(entity, response, false);
@@ -1001,8 +1001,8 @@ public class LeveldbTimelineStore extends AbstractService
   @Private
   @VisibleForTesting
   public TimelinePutResponse putWithNoDomainId(TimelineEntities entities) {
+    deleteLock.readLock().lock();
     try {
-      deleteLock.readLock().lock();
       TimelinePutResponse response = new TimelinePutResponse();
       for (TimelineEntity entity : entities.getEntities()) {
         put(entity, response, true);
@@ -1525,8 +1525,8 @@ public class LeveldbTimelineStore extends AbstractService
         LeveldbIterator iterator = null;
         LeveldbIterator pfIterator = null;
         long typeCount = 0;
+        deleteLock.writeLock().lock();
         try {
-          deleteLock.writeLock().lock();
           iterator = getDbIterator(false);
           pfIterator = getDbIterator(false);
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
index b4792a8899c..ab53c48b111 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
@@ -28,12 +28,14 @@ import java.net.URI;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBContext;
 import javax.ws.rs.core.MediaType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
@@ -949,6 +951,15 @@ public class TestAHSWebServices extends JerseyTestBase {
         String.valueOf(content.length()));
   }
 
+  @Test
+  public void testContextFactory() throws Exception {
+    JAXBContext jaxbContext1 = ContextFactory.createContext(
+        new Class[]{}, Collections.EMPTY_MAP);
+    JAXBContext jaxbContext2 = ContextFactory.createContext(
+        new Class[]{}, Collections.EMPTY_MAP);
+    assertEquals(jaxbContext1, jaxbContext2);
+  }
+
   private static String getRedirectURL(String url) {
     String redirectUrl = null;
     try {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
index a87c494ddb5..61e43641005 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
@@ -569,8 +569,8 @@ public abstract class ContainerExecutor implements Configurable {
    * @return the path of the pid-file for the given containerId.
    */
   protected Path getPidFilePath(ContainerId containerId) {
+    readLock.lock();
     try {
-      readLock.lock();
       return (this.pidFiles.get(containerId));
     } finally {
       readLock.unlock();
@@ -720,9 +720,8 @@ public abstract class ContainerExecutor implements Configurable {
    * @return true if the container is active
    */
   protected boolean isContainerActive(ContainerId containerId) {
+    readLock.lock();
     try {
-      readLock.lock();
-
       return (this.pidFiles.containsKey(containerId));
     } finally {
       readLock.unlock();
@@ -742,8 +741,8 @@ public abstract class ContainerExecutor implements Configurable {
    * of the launched process
    */
   public void activateContainer(ContainerId containerId, Path pidFilePath) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.pidFiles.put(containerId, pidFilePath);
     } finally {
       writeLock.unlock();
@@ -778,8 +777,8 @@ public abstract class ContainerExecutor implements Configurable {
    * @param containerId the container ID
    */
   public void deactivateContainer(ContainerId containerId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.pidFiles.remove(containerId);
     } finally {
       writeLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java
index ad995fb3a28..5f02e3367ab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java
@@ -667,8 +667,8 @@ public class ApplicationImpl implements Application {
 
   @VisibleForTesting
   public LogAggregationContext getLogAggregationContext() {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       return this.logAggregationContext;
     } finally {
       this.readLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
index 8aa8d0749e6..d25206cd9ed 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
@@ -953,8 +953,8 @@ public class ContainerImpl implements Container {
 
   @Override
   public void setIpAndHost(String[] ipAndHost) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       this.ips = ipAndHost[0];
       this.host = ipAndHost[1];
     } finally {
@@ -2107,9 +2107,8 @@ public class ContainerImpl implements Container {
 
   @Override
   public void handle(ContainerEvent event) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
-
       ContainerId containerID = event.getContainerID();
       if (LOG.isDebugEnabled()) {
         LOG.debug("Processing " + containerID + " of type " + event.getType());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
index d2ec207f157..4fa6c02b92c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/CGroupsHandlerImpl.java
@@ -130,8 +130,8 @@ class CGroupsHandlerImpl implements CGroupsHandler {
 
   @Override
   public String getControllerPath(CGroupController controller) {
+    rwLock.readLock().lock();
     try {
-      rwLock.readLock().lock();
       return controllerPaths.get(controller);
     } finally {
       rwLock.readLock().unlock();
@@ -169,8 +169,8 @@ class CGroupsHandlerImpl implements CGroupsHandler {
     }
 
     // we want to do a bulk update without the paths changing concurrently
+    rwLock.writeLock().lock();
     try {
-      rwLock.writeLock().lock();
       controllerPaths = cPaths;
       parsedMtab = newMtab;
     } finally {
@@ -293,10 +293,9 @@ class CGroupsHandlerImpl implements CGroupsHandler {
 
     if (existingMountPath == null ||
         !requestedMountPath.equals(existingMountPath)) {
+      //lock out other readers/writers till we are done
+      rwLock.writeLock().lock();
       try {
-        //lock out other readers/writers till we are done
-        rwLock.writeLock().lock();
-
         // If the controller was already mounted we have to mount it
         // with the same options to clone the mount point otherwise
         // the operation will fail
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalizedResource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalizedResource.java
index 7cca7cf711a..25990d67a69 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalizedResource.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalizedResource.java
@@ -116,8 +116,8 @@ public class LocalizedResource implements EventHandler<ResourceEvent> {
       .append(getState() == ResourceState.LOCALIZED
           ? getLocalPath() + "," + getSize()
           : "pending").append(",[");
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       for (ContainerId c : ref) {
         sb.append("(").append(c.toString()).append(")");
       }
@@ -187,9 +187,8 @@ public class LocalizedResource implements EventHandler<ResourceEvent> {
 
   @Override
   public void handle(ResourceEvent event) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
-
       Path resourcePath = event.getLocalResourceRequest().getPath();
       if (LOG.isDebugEnabled()) {
         LOG.debug("Processing " + resourcePath + " of type " + event.getType());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaDiscoverer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaDiscoverer.java
index 8d32a18bf70..32b88b2dbc8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaDiscoverer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaDiscoverer.java
@@ -19,21 +19,34 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileUtil;
+import org.apache.hadoop.util.Shell.ShellCommandExecutor;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery.AoclOutputBasedDiscoveryStrategy;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery.FPGADiscoveryStrategy;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery.ScriptBasedFPGADiscoveryStrategy;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery.SettingsBasedFPGADiscoveryStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Iterator;
-import java.util.List;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
 
 public class FpgaDiscoverer {
-
-  public static final Logger LOG = LoggerFactory.getLogger(
+  private static final Logger LOG = LoggerFactory.getLogger(
       FpgaDiscoverer.class);
 
   private static FpgaDiscoverer instance;
@@ -44,8 +57,10 @@ public class FpgaDiscoverer {
 
   private List<FpgaResourceAllocator.FpgaDevice> currentFpgaInfo = null;
 
+  private Function<String, Optional<String>> scriptRunner = this::runScript;
+
   // shell command timeout
-  private static final int MAX_EXEC_TIMEOUT_MS = 10 * 1000;
+  public static final int MAX_EXEC_TIMEOUT_MS = 10 * 1000;
 
   static {
     instance = new FpgaDiscoverer();
@@ -56,31 +71,41 @@ public class FpgaDiscoverer {
   }
 
   @VisibleForTesting
-  public synchronized static FpgaDiscoverer setInstance(FpgaDiscoverer newInstance) {
+  void setScriptRunner(Function<String, Optional<String>> scriptRunner) {
+    this.scriptRunner = scriptRunner;
+  }
+
+  @VisibleForTesting
+  static void reset() {
+    instance = new FpgaDiscoverer();
+  }
+
+  @VisibleForTesting
+  public static FpgaDiscoverer setInstance(FpgaDiscoverer newInstance) {
     instance = newInstance;
     return instance;
   }
 
   @VisibleForTesting
-  public synchronized void setConf(Configuration conf) {
-    this.conf = conf;
+  public void setConf(Configuration configuration) {
+    this.conf = configuration;
   }
 
   public List<FpgaResourceAllocator.FpgaDevice> getCurrentFpgaInfo() {
     return currentFpgaInfo;
   }
 
-  public synchronized void setResourceHanderPlugin(AbstractFpgaVendorPlugin plugin) {
-    this.plugin = plugin;
+  public void setResourceHanderPlugin(AbstractFpgaVendorPlugin vendorPlugin) {
+    this.plugin = vendorPlugin;
   }
 
-  public synchronized boolean diagnose() {
+  public boolean diagnose() {
     return this.plugin.diagnose(MAX_EXEC_TIMEOUT_MS);
   }
 
-  public synchronized void initialize(Configuration conf) throws YarnException {
-    this.conf = conf;
-    this.plugin.initPlugin(conf);
+  public void initialize(Configuration config) throws YarnException {
+    this.conf = config;
+    this.plugin.initPlugin(config);
     // Try to diagnose FPGA
     LOG.info("Trying to diagnose FPGA information ...");
     if (!diagnose()) {
@@ -91,40 +116,45 @@ public class FpgaDiscoverer {
   /**
    * get avialable devices minor numbers from toolchain or static configuration
    * */
-  public synchronized List<FpgaResourceAllocator.FpgaDevice> discover() throws ResourceHandlerException {
+  public List<FpgaResourceAllocator.FpgaDevice> discover()
+      throws ResourceHandlerException {
     List<FpgaResourceAllocator.FpgaDevice> list;
     String allowed = this.conf.get(YarnConfiguration.NM_FPGA_ALLOWED_DEVICES);
-    // whatever static or auto discover, we always needs
-    // the vendor plugin to discover. For instance, IntelFpgaOpenclPlugin need to
-    // setup a mapping of <major:minor> to <aliasDevName>
-    list = this.plugin.discover(MAX_EXEC_TIMEOUT_MS);
-    if (0 == list.size()) {
-      throw new ResourceHandlerException("No FPGA devices detected!");
+
+    String availableDevices = conf.get(
+        YarnConfiguration.NM_FPGA_AVAILABLE_DEVICES);
+    String discoveryScript = conf.get(
+        YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT);
+
+    FPGADiscoveryStrategy discoveryStrategy;
+    if (availableDevices != null) {
+      discoveryStrategy =
+          new SettingsBasedFPGADiscoveryStrategy(
+              plugin.getFpgaType(), availableDevices);
+    } else if (discoveryScript != null) {
+      discoveryStrategy =
+          new ScriptBasedFPGADiscoveryStrategy(
+              plugin.getFpgaType(), scriptRunner, discoveryScript);
+    } else {
+      discoveryStrategy = new AoclOutputBasedDiscoveryStrategy(plugin);
     }
-    currentFpgaInfo = list;
-    if (allowed.equalsIgnoreCase(
+
+    list = discoveryStrategy.discover();
+
+    if (allowed == null || allowed.equalsIgnoreCase(
         YarnConfiguration.AUTOMATICALLY_DISCOVER_GPU_DEVICES)) {
-        return list;
+      return list;
     } else if (allowed.matches("(\\d,)*\\d")){
-      String[] minors = allowed.split(",");
-      Iterator<FpgaResourceAllocator.FpgaDevice> iterator = list.iterator();
-      // remove the non-configured minor numbers
-      FpgaResourceAllocator.FpgaDevice t;
-      while (iterator.hasNext()) {
-        boolean valid = false;
-        t = iterator.next();
-        for (String minorNumber : minors) {
-          if (t.getMinor().toString().equals(minorNumber)) {
-            valid = true;
-            break;
-          }
-        }
-        if (!valid) {
-          iterator.remove();
-        }
-      }
+      Set<String> minors = Sets.newHashSet(allowed.split(","));
+
+      // Replace list with a filtered one
+      list = list
+        .stream()
+        .filter(dev -> minors.contains(dev.getMinor().toString()))
+        .collect(Collectors.toList());
+
       // if the count of user configured is still larger than actual
-      if (list.size() != minors.length) {
+      if (list.size() != minors.size()) {
         LOG.warn("We continue although there're mistakes in user's configuration " +
             YarnConfiguration.NM_FPGA_ALLOWED_DEVICES +
             "user configured:" + allowed + ", while the real:" + list.toString());
@@ -133,7 +163,41 @@ public class FpgaDiscoverer {
       throw new ResourceHandlerException("Invalid value configured for " +
           YarnConfiguration.NM_FPGA_ALLOWED_DEVICES + ":\"" + allowed + "\"");
     }
+
+    currentFpgaInfo = ImmutableList.copyOf(list);
+
     return list;
   }
 
+  private Optional<String> runScript(String path) {
+    if (path == null || path.trim().isEmpty()) {
+      LOG.error("Undefined script");
+      return Optional.empty();
+    }
+
+    File f = new File(path);
+    if (!f.exists()) {
+      LOG.error("Script does not exist");
+      return Optional.empty();
+    }
+
+    if (!FileUtil.canExecute(f)) {
+      LOG.error("Script is not executable");
+      return Optional.empty();
+    }
+
+    ShellCommandExecutor shell = new ShellCommandExecutor(
+        new String[] {path},
+        null,
+        null,
+        MAX_EXEC_TIMEOUT_MS);
+    try {
+      shell.execute();
+      String output = shell.getOutput();
+      return Optional.of(output);
+    } catch (IOException e) {
+      LOG.error("Cannot execute script", e);
+      return Optional.empty();
+    }
+  }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaNodeResourceUpdateHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaNodeResourceUpdateHandler.java
index 7511d8f0b3d..fdba9a428b8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaNodeResourceUpdateHandler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/FpgaNodeResourceUpdateHandler.java
@@ -20,6 +20,12 @@
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga;
 
 
+import static org.apache.hadoop.yarn.api.records.ResourceInformation.FPGA_URI;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceInformation;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -30,13 +36,6 @@ import org.apache.hadoop.yarn.util.resource.ResourceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.hadoop.yarn.api.records.ResourceInformation.FPGA_URI;
-
 public class FpgaNodeResourceUpdateHandler extends NodeResourceUpdaterPlugin {
   private static final Logger LOG = LoggerFactory.getLogger(
       FpgaNodeResourceUpdateHandler.class);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
index f8fb6d8a24f..1f9cba78fc3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java
@@ -100,6 +100,7 @@ public class IntelFpgaOpenclPlugin implements AbstractFpgaVendorPlugin {
     if (this.initialized) {
       return true;
     }
+
     // Find the proper toolchain, mainly aocl
     String pluginDefaultBinaryName = getDefaultBinaryName();
     String pathToExecutable = conf.get(YarnConfiguration.NM_FPGA_PATH_TO_EXEC,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/AoclOutputBasedDiscoveryStrategy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/AoclOutputBasedDiscoveryStrategy.java
new file mode 100644
index 00000000000..bfa33ce9e5b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/AoclOutputBasedDiscoveryStrategy.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
+
+import java.util.List;
+
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.AbstractFpgaVendorPlugin;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.FpgaDiscoverer;
+
+/**
+ * FPGA device discovery strategy which invokes the "aocl" SDK command
+ * to retrieve the list of available FPGA cards.
+ */
+public class AoclOutputBasedDiscoveryStrategy
+    implements FPGADiscoveryStrategy {
+
+  private final AbstractFpgaVendorPlugin plugin;
+
+  public AoclOutputBasedDiscoveryStrategy(AbstractFpgaVendorPlugin fpgaPlugin) {
+    this.plugin = fpgaPlugin;
+  }
+
+  @Override
+  public List<FpgaDevice> discover() throws ResourceHandlerException {
+    List<FpgaDevice> list =
+        plugin.discover(FpgaDiscoverer.MAX_EXEC_TIMEOUT_MS);
+    if (list.isEmpty()) {
+      throw new ResourceHandlerException("No FPGA devices detected!");
+    }
+
+    return list;
+  }
+}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/DeviceSpecParser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/DeviceSpecParser.java
new file mode 100644
index 00000000000..44f4b6c32a4
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/DeviceSpecParser.java
@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
+
+/**
+ * Parses a string which specifies FPGA devices. Multiple devices should be
+ * separated by a comma. A device specification should contain the
+ * symbolic name of the device, major and minor device numbers.
+ *
+ * Example: "acl0/243:0,acl1/243:1".
+ */
+public final class DeviceSpecParser {
+  private static final String DEVICE_SPEC_REGEX =
+      "(\\w+[0-31])(\\/)(\\d+)(\\:)(\\d+)";
+
+  private static final Pattern DEVICE_PATTERN =
+      Pattern.compile(DEVICE_SPEC_REGEX);
+
+  private DeviceSpecParser() {
+    // no instances
+  }
+
+  static List<FpgaDevice> getDevicesFromString(String type, String devices)
+      throws ResourceHandlerException {
+    if (devices.trim().isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    String[] deviceList = devices.split(",");
+
+    List<FpgaDevice> fpgaDevices = new ArrayList<>();
+
+    for (final String deviceSpec : deviceList) {
+      Matcher matcher = DEVICE_PATTERN.matcher(deviceSpec);
+      if (matcher.matches()) {
+        try {
+          String devName = matcher.group(1);
+          int major = Integer.parseInt(matcher.group(3));
+          int minor = Integer.parseInt(matcher.group(5));
+          fpgaDevices.add(new FpgaDevice(type,
+              major,
+              minor,
+              null,
+              null,
+              devName,
+              null,
+              null,
+              null));
+        } catch (NumberFormatException e) {
+          throw new ResourceHandlerException(
+              "Cannot parse major/minor number: " + deviceSpec);
+        }
+      } else {
+        throw new ResourceHandlerException(
+            "Illegal device specification string: " + deviceSpec);
+      }
+    }
+
+    return fpgaDevices;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/FPGADiscoveryStrategy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/FPGADiscoveryStrategy.java
new file mode 100644
index 00000000000..a707ac672e9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/FPGADiscoveryStrategy.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
+
+import java.util.List;
+
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
+
+/**
+ * Interface for an FPGA device discovery strategy.
+ */
+public interface FPGADiscoveryStrategy {
+  List<FpgaDevice> discover() throws ResourceHandlerException;
+}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/ScriptBasedFPGADiscoveryStrategy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/ScriptBasedFPGADiscoveryStrategy.java
new file mode 100644
index 00000000000..bda45398829
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/ScriptBasedFPGADiscoveryStrategy.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
+
+/**
+ * FPGA device discovery strategy which invokes an external script.
+ * The script must return a single line in given format.
+ *
+ * See DeviceSpecParser for details.
+ */
+public class ScriptBasedFPGADiscoveryStrategy
+    implements FPGADiscoveryStrategy {
+
+  private final Function<String, Optional<String>> scriptRunner;
+  private final String discoveryScript;
+  private final String type;
+
+  public ScriptBasedFPGADiscoveryStrategy(
+      String fpgaType,
+      Function<String, Optional<String>> scriptRunner,
+      String propValue) {
+    this.scriptRunner = scriptRunner;
+    this.discoveryScript = propValue;
+    this.type = fpgaType;
+  }
+
+  @Override
+  public List<FpgaDevice> discover() throws ResourceHandlerException {
+    Optional<String> scriptOutput =
+        scriptRunner.apply(discoveryScript);
+    if (scriptOutput.isPresent()) {
+      List<FpgaDevice> list =
+          DeviceSpecParser.getDevicesFromString(type, scriptOutput.get());
+      if (list.isEmpty()) {
+        throw new ResourceHandlerException("No FPGA devices were specified");
+      }
+      return list;
+    } else {
+      throw new ResourceHandlerException("Unable to run external script");
+    }
+  }
+}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/SettingsBasedFPGADiscoveryStrategy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/SettingsBasedFPGADiscoveryStrategy.java
new file mode 100644
index 00000000000..eb7bea84215
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/SettingsBasedFPGADiscoveryStrategy.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
+
+import java.util.List;
+
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
+
+/**
+ * FPGA device discovery strategy which parses a string.
+ * The string must consist of a single line and be in a specific format.
+ *
+ * See DeviceSpecParser for details.
+ */
+public class SettingsBasedFPGADiscoveryStrategy
+    implements FPGADiscoveryStrategy {
+
+  private final String type;
+  private final String availableDevices;
+
+  public SettingsBasedFPGADiscoveryStrategy(
+      String fpgaType, String devices) {
+    this.type = fpgaType;
+    this.availableDevices = devices;
+  }
+
+  @Override
+  public List<FpgaDevice> discover() throws ResourceHandlerException {
+    List<FpgaDevice> list =
+        DeviceSpecParser.getDevicesFromString(type, availableDevices);
+    if (list.isEmpty()) {
+      throw new ResourceHandlerException("No FPGA devices were specified");
+    }
+    return list;
+  }
+}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/package-info.java
new file mode 100644
index 00000000000..8a0471ccf2a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/discovery/package-info.java
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.fpga.discovery;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDiscoverer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDiscoverer.java
index 334a86c2c82..6cf6a8dbbf2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDiscoverer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDiscoverer.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugi
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -41,6 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public class GpuDiscoverer {
@@ -74,6 +76,29 @@ public class GpuDiscoverer {
     }
   }
 
+  private String getErrorMessageOfScriptExecution(String msg) {
+    return getFailedToExecuteScriptMessage() +
+        "! Exception message: " + msg;
+  }
+
+  private String getErrorMessageOfScriptExecutionThresholdReached() {
+    return getFailedToExecuteScriptMessage() + " for " +
+        MAX_REPEATED_ERROR_ALLOWED + " times, " +
+        "skipping following executions!";
+  }
+
+  private String getFailedToExecuteScriptMessage() {
+    return "Failed to execute " +
+        GpuDeviceInformationParser.GPU_SCRIPT_REFERENCE +
+        " (" + pathOfGpuBinary + ")";
+  }
+
+  private String getFailedToParseErrorMessage(String msg) {
+    return "Failed to parse XML output of " +
+        GpuDeviceInformationParser.GPU_SCRIPT_REFERENCE
+        + "( " + pathOfGpuBinary + ")" + msg;
+  }
+
   /**
    * Get GPU device information from system.
    * This need to be called after initialize.
@@ -88,17 +113,8 @@ public class GpuDiscoverer {
       throws YarnException {
     validateConfOrThrowException();
 
-    if (null == pathOfGpuBinary) {
-      throw new YarnException(
-          "Failed to find GPU discovery executable, please double check "
-              + YarnConfiguration.NM_GPU_PATH_TO_EXEC + " setting.");
-    }
-
     if (numOfErrorExecutionSinceLastSucceed == MAX_REPEATED_ERROR_ALLOWED) {
-      String msg =
-          "Failed to execute GPU device information detection script for "
-              + MAX_REPEATED_ERROR_ALLOWED
-              + " times, skip following executions.";
+      String msg = getErrorMessageOfScriptExecutionThresholdReached();
       LOG.error(msg);
       throw new YarnException(msg);
     }
@@ -112,16 +128,14 @@ public class GpuDiscoverer {
       return lastDiscoveredGpuInformation;
     } catch (IOException e) {
       numOfErrorExecutionSinceLastSucceed++;
-      String msg =
-          "Failed to execute " + pathOfGpuBinary + " exception message:" + e
-              .getMessage() + ", continue ...";
+      String msg = getErrorMessageOfScriptExecution(e.getMessage());
       if (LOG.isDebugEnabled()) {
         LOG.debug(msg);
       }
-      throw new YarnException(e);
+      throw new YarnException(msg, e);
     } catch (YarnException e) {
       numOfErrorExecutionSinceLastSucceed++;
-      String msg = "Failed to parse xml output" + e.getMessage();
+      String msg = getFailedToParseErrorMessage(e.getMessage());
       if (LOG.isDebugEnabled()) {
         LOG.warn(msg, e);
       }
@@ -227,50 +241,17 @@ public class GpuDiscoverer {
     }
   }
 
-  public synchronized void initialize(Configuration conf) {
-    this.conf = conf;
+  public synchronized void initialize(Configuration config)
+      throws YarnException {
+    this.conf = config;
     numOfErrorExecutionSinceLastSucceed = 0;
-    String pathToExecutable = conf.get(YarnConfiguration.NM_GPU_PATH_TO_EXEC,
-        YarnConfiguration.DEFAULT_NM_GPU_PATH_TO_EXEC);
-    if (pathToExecutable.isEmpty()) {
-      pathToExecutable = DEFAULT_BINARY_NAME;
-    }
-
-    File binaryPath = new File(pathToExecutable);
-    if (!binaryPath.exists()) {
-      // When binary not exist, use default setting.
-      boolean found = false;
-      for (String dir : DEFAULT_BINARY_SEARCH_DIRS) {
-        binaryPath = new File(dir, DEFAULT_BINARY_NAME);
-        if (binaryPath.exists()) {
-          found = true;
-          pathOfGpuBinary = binaryPath.getAbsolutePath();
-          break;
-        }
-      }
-
-      if (!found) {
-        LOG.warn("Failed to locate binary at:" + binaryPath.getAbsolutePath()
-            + ", please double check [" + YarnConfiguration.NM_GPU_PATH_TO_EXEC
-            + "] setting. Now use " + "default binary:" + DEFAULT_BINARY_NAME);
-      }
-    } else{
-      // If path specified by user is a directory, use
-      if (binaryPath.isDirectory()) {
-        binaryPath = new File(binaryPath, DEFAULT_BINARY_NAME);
-        LOG.warn("Specified path is a directory, use " + DEFAULT_BINARY_NAME
-            + " under the directory, updated path-to-executable:" + binaryPath
-            .getAbsolutePath());
-      }
-      // Validated
-      pathOfGpuBinary = binaryPath.getAbsolutePath();
-    }
+    lookUpAutoDiscoveryBinary(config);
 
     // Try to discover GPU information once and print
     try {
       LOG.info("Trying to discover GPU information ...");
       GpuDeviceInformation info = getGpuDeviceInformation();
-      LOG.info(info.toString());
+      LOG.info("Discovered GPU information: " + info.toString());
     } catch (YarnException e) {
       String msg =
           "Failed to discover GPU information from system, exception message:"
@@ -279,6 +260,71 @@ public class GpuDiscoverer {
     }
   }
 
+  private void lookUpAutoDiscoveryBinary(Configuration config)
+      throws YarnException {
+    String configuredBinaryPath = config.get(
+        YarnConfiguration.NM_GPU_PATH_TO_EXEC, DEFAULT_BINARY_NAME);
+    if (configuredBinaryPath.isEmpty()) {
+      configuredBinaryPath = DEFAULT_BINARY_NAME;
+    }
+
+    File binaryPath;
+    File configuredBinaryFile = new File(configuredBinaryPath);
+    if (!configuredBinaryFile.exists()) {
+      binaryPath = lookupBinaryInDefaultDirs();
+    } else if (configuredBinaryFile.isDirectory()) {
+      binaryPath = handleConfiguredBinaryPathIsDirectory(configuredBinaryFile);
+    } else {
+      binaryPath = configuredBinaryFile;
+    }
+    pathOfGpuBinary = binaryPath.getAbsolutePath();
+  }
+
+  private File handleConfiguredBinaryPathIsDirectory(File configuredBinaryFile)
+      throws YarnException {
+    File binaryPath = new File(configuredBinaryFile, DEFAULT_BINARY_NAME);
+    if (!binaryPath.exists()) {
+      throw new YarnException("Failed to find GPU discovery executable, " +
+          "please double check "+ YarnConfiguration.NM_GPU_PATH_TO_EXEC +
+          " setting. The setting points to a directory but " +
+          "no file found in the directory with name:" + DEFAULT_BINARY_NAME);
+    } else {
+      LOG.warn("Specified path is a directory, use " + DEFAULT_BINARY_NAME
+          + " under the directory, updated path-to-executable:"
+          + binaryPath.getAbsolutePath());
+    }
+    return binaryPath;
+  }
+
+  private File lookupBinaryInDefaultDirs() throws YarnException {
+    final File lookedUpBinary = lookupBinaryInDefaultDirsInternal();
+    if (lookedUpBinary == null) {
+      throw new YarnException("Failed to find GPU discovery executable, " +
+          "please double check " + YarnConfiguration.NM_GPU_PATH_TO_EXEC +
+          " setting. Also tried to find the executable " +
+          "in the default directories: " + DEFAULT_BINARY_SEARCH_DIRS);
+    }
+    return lookedUpBinary;
+  }
+
+  private File lookupBinaryInDefaultDirsInternal() {
+    Set<String> triedBinaryPaths = Sets.newHashSet();
+    for (String dir : DEFAULT_BINARY_SEARCH_DIRS) {
+      File binaryPath = new File(dir, DEFAULT_BINARY_NAME);
+      if (binaryPath.exists()) {
+        return binaryPath;
+      } else {
+        triedBinaryPaths.add(binaryPath.getAbsolutePath());
+      }
+    }
+    LOG.warn("Failed to locate GPU device discovery binary, tried paths: "
+        + triedBinaryPaths + "! Please double check the value of config "
+        + YarnConfiguration.NM_GPU_PATH_TO_EXEC +
+        ". Using default binary: " + DEFAULT_BINARY_NAME);
+
+    return null;
+  }
+
   @VisibleForTesting
   Map<String, String> getEnvironmentToRunCommand() {
     return environment;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/dao/gpu/GpuDeviceInformationParser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/dao/gpu/GpuDeviceInformationParser.java
index 1bd92f63a88..894cb70ca61 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/dao/gpu/GpuDeviceInformationParser.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/dao/gpu/GpuDeviceInformationParser.java
@@ -43,6 +43,8 @@ import java.io.StringReader;
 public class GpuDeviceInformationParser {
   private static final Logger LOG = LoggerFactory.getLogger(
       GpuDeviceInformationParser.class);
+  public static final String GPU_SCRIPT_REFERENCE = "GPU device detection " +
+      "script";
 
   private Unmarshaller unmarshaller = null;
   private XMLReader xmlReader = null;
@@ -70,7 +72,9 @@ public class GpuDeviceInformationParser {
       try {
         init();
       } catch (SAXException | ParserConfigurationException | JAXBException e) {
-        LOG.error("Exception while initialize parser", e);
+        String msg = "Exception while initializing parser for " +
+            GPU_SCRIPT_REFERENCE;
+        LOG.error(msg, e);
         throw new YarnException(e);
       }
     }
@@ -80,8 +84,10 @@ public class GpuDeviceInformationParser {
     try {
       return (GpuDeviceInformation) unmarshaller.unmarshal(source);
     } catch (JAXBException e) {
-      LOG.error("Exception while parsing xml", e);
-      throw new YarnException(e);
+      String msg = "Failed to parse XML output of " +
+          GPU_SCRIPT_REFERENCE + "!";
+      LOG.error(msg, e);
+      throw new YarnException(msg, e);
     }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
index 59a39fafd43..090d2fc08b8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
@@ -416,12 +416,6 @@ int get_docker_command(const char *command_file, const struct configuration *con
     return INVALID_COMMAND_FILE;
   }
 
-  char *value = get_configuration_value("use-entry-point", DOCKER_COMMAND_FILE_SECTION, &command_config);
-  if (value != NULL && strcasecmp(value, "true") == 0) {
-    entry_point = 1;
-  }
-  free(value);
-
   char *docker = get_docker_binary(conf);
   ret = add_to_args(args, docker);
   free(docker);
@@ -1527,6 +1521,12 @@ static int set_privileged(const struct configuration *command_config, const stru
     if (privileged_container_enabled != NULL) {
       if (strcmp(privileged_container_enabled, "1") == 0 ||
           strcasecmp(privileged_container_enabled, "True") == 0) {
+        // Disable set privileged if entry point mode is disabled
+        if (get_use_entry_point_flag() != 1) {
+          fprintf(ERRORFILE, "Privileged containers are disabled for non-entry-point mode\n");
+          ret = PRIVILEGED_CONTAINERS_DISABLED;
+          goto free_and_exit;
+        }
         // Disable set privileged if image is not trusted.
         if (check_trusted_image(command_config, conf) != 0) {
           fprintf(ERRORFILE, "Privileged containers are disabled from untrusted source\n");
@@ -1570,12 +1570,19 @@ int get_docker_run_command(const char *command_file, const struct configuration
   char **launch_command = NULL;
   char *privileged = NULL;
   char *no_new_privileges_enabled = NULL;
+  char *use_entry_point = NULL;
   struct configuration command_config = {0, NULL};
   ret = read_and_verify_command_file(command_file, DOCKER_RUN_COMMAND, &command_config);
   if (ret != 0) {
     goto free_and_exit;
   }
 
+  use_entry_point = get_configuration_value("use-entry-point", DOCKER_COMMAND_FILE_SECTION, &command_config);
+  if (use_entry_point != NULL && strcasecmp(use_entry_point, "true") == 0) {
+    entry_point = 1;
+  }
+  free(use_entry_point);
+
   container_name = get_configuration_value("name", DOCKER_COMMAND_FILE_SECTION, &command_config);
   if (container_name == NULL || validate_container_name(container_name) != 0) {
     ret = INVALID_DOCKER_CONTAINER_NAME;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/utils/test_docker_util.cc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/utils/test_docker_util.cc
index a2f843dc321..3d052e4ce5b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/utils/test_docker_util.cc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/utils/test_docker_util.cc
@@ -791,7 +791,7 @@ namespace ContainerExecutor {
     std::vector<std::pair<std::string, std::string> > file_cmd_vec;
     std::vector<std::pair<std::string, std::string> >::const_iterator itr;
     file_cmd_vec.push_back(std::make_pair<std::string, std::string>(
-        "[docker-command-execution]\n  docker-command=run\n  privileged=true\n  image=hadoop/image", "--privileged "));
+        "[docker-command-execution]\n  docker-command=run\n  privileged=true\n  image=hadoop/image\n  use-entry-point=true", "--privileged "));
     file_cmd_vec.push_back(std::make_pair<std::string, std::string>(
         "[docker-command-execution]\n  docker-command=run\n  privileged=false\n image=hadoop/image", ""));
     file_cmd_vec.push_back(std::make_pair<std::string, std::string>(
@@ -1459,7 +1459,7 @@ namespace ContainerExecutor {
         "[docker-command-execution]\n"
             "  docker-command=run\n  name=container_e1_12312_11111_02_000001\n  image=hadoop/docker-image\n  user=root\n  hostname=host-id\n"
             "  mounts=/var/log:/var/log:ro,/var/lib:/lib:ro,/usr/bin/cut:/usr/bin/cut:ro,/tmp:/tmp:rw\n"
-            "  network=bridge\n  devices=/dev/test:/dev/test\n  privileged=true\n"
+            "  network=bridge\n  devices=/dev/test:/dev/test\n  privileged=true\n  use-entry-point=true\n"
             "  cap-add=CHOWN,SETUID\n  cgroup-parent=ctr-cgroup\n  detach=true\n  rm=true\n"
             "  launch-command=bash,test_script.sh,arg1,arg2",
         "run --name=container_e1_12312_11111_02_000001 -d --rm -v /var/log:/var/log:ro -v /var/lib:/lib:ro"
@@ -1471,7 +1471,7 @@ namespace ContainerExecutor {
         "[docker-command-execution]\n"
             "  docker-command=run\n  name=container_e1_12312_11111_02_000001\n  image=hadoop/docker-image\n  user=root\n  hostname=host-id\n"
             "  mounts=/var/log:/var/log:ro,/var/lib:/lib:ro,/usr/bin/cut:/usr/bin/cut:ro,/tmp:/tmp:rw\n"
-            "  network=bridge\n  devices=/dev/test:/dev/test\n  privileged=true\n"
+            "  network=bridge\n  devices=/dev/test:/dev/test\n  privileged=true\n  use-entry-point=true\n"
             "  cap-add=CHOWN,SETUID\n  cgroup-parent=ctr-cgroup\n  detach=true\n  rm=true\n  group-add=1000,1001\n"
             "  launch-command=bash,test_script.sh,arg1,arg2",
         "run --name=container_e1_12312_11111_02_000001 -d --rm -v /var/log:/var/log:ro -v /var/lib:/lib:ro"
@@ -1860,7 +1860,7 @@ namespace ContainerExecutor {
 
       std::vector<std::pair<std::string, std::string> > file_cmd_vec;
       file_cmd_vec.push_back(std::make_pair<std::string, std::string>(
-          "[docker-command-execution]\n  docker-command=run\n privileged=true\n"
+          "[docker-command-execution]\n  docker-command=run\n privileged=true\n  use-entry-point=true\n"
           "name=container_e1_12312_11111_02_000001\n  image=hadoop/docker-image\n  user=root",
           "run --name=container_e1_12312_11111_02_000001 --privileged --cap-drop=ALL hadoop/docker-image"));
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
index fb0df39ed2c..966662fa89c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.gpu;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -41,10 +42,13 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.Contai
 import org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService;
 import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
 import org.apache.hadoop.yarn.util.resource.CustomResourceTypesConfigurationProvider;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -72,9 +76,42 @@ public class TestGpuResourceHandler {
   private NMStateStoreService mockNMStateStore;
   private ConcurrentHashMap<ContainerId, Container> runningContainersMap;
   private GpuDiscoverer gpuDiscoverer;
+  private File testDataDirectory;
+
+  public void createTestDataDirectory() throws IOException {
+    String testDirectoryPath = getTestParentDirectory();
+    testDataDirectory = new File(testDirectoryPath);
+    FileUtils.deleteDirectory(testDataDirectory);
+    testDataDirectory.mkdirs();
+  }
+
+  private String getTestParentDirectory() {
+    File f = new File("target/temp/" + TestGpuResourceHandler.class.getName());
+    return f.getAbsolutePath();
+  }
+
+  private void touchFile(File f) throws IOException {
+    new FileOutputStream(f).close();
+  }
+
+  private Configuration createDefaultConfig() throws IOException {
+    Configuration conf = new YarnConfiguration();
+    File fakeBinary = setupFakeGpuDiscoveryBinary();
+    conf.set(YarnConfiguration.NM_GPU_PATH_TO_EXEC,
+        fakeBinary.getAbsolutePath());
+    return conf;
+  }
+
+  private File setupFakeGpuDiscoveryBinary() throws IOException {
+    File fakeBinary = new File(getTestParentDirectory() + "/fake-nvidia-smi");
+    touchFile(fakeBinary);
+    return fakeBinary;
+  }
 
   @Before
-  public void setup() {
+  public void setup() throws IOException {
+    createTestDataDirectory();
+
     CustomResourceTypesConfigurationProvider.
         initResourceTypes(ResourceInformation.GPU_URI);
 
@@ -95,9 +132,14 @@ public class TestGpuResourceHandler {
         mockPrivilegedExecutor, gpuDiscoverer);
   }
 
+  @After
+  public void cleanupTestFiles() throws IOException {
+    FileUtils.deleteDirectory(testDataDirectory);
+  }
+
   @Test
   public void testBootStrap() throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0");
 
     gpuDiscoverer.initialize(conf);
@@ -162,7 +204,7 @@ public class TestGpuResourceHandler {
 
   private void commonTestAllocation(boolean dockerContainerEnabled)
       throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
     gpuDiscoverer.initialize(conf);
 
@@ -251,7 +293,7 @@ public class TestGpuResourceHandler {
   @Test
   public void testAssignedGpuWillBeCleanedupWhenStoreOpFails()
       throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
     gpuDiscoverer.initialize(conf);
 
@@ -280,7 +322,7 @@ public class TestGpuResourceHandler {
 
   @Test
   public void testAllocationWithoutAllowedGpus() throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, " ");
     gpuDiscoverer.initialize(conf);
 
@@ -315,7 +357,7 @@ public class TestGpuResourceHandler {
 
   @Test
   public void testAllocationStored() throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
     gpuDiscoverer.initialize(conf);
 
@@ -354,7 +396,7 @@ public class TestGpuResourceHandler {
   public void testAllocationStoredWithNULLStateStore() throws Exception {
     NMNullStateStoreService mockNMNULLStateStore = mock(NMNullStateStoreService.class);
 
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
 
     Context nmnctx = mock(Context.class);
@@ -383,7 +425,7 @@ public class TestGpuResourceHandler {
 
   @Test
   public void testRecoverResourceAllocation() throws Exception {
-    Configuration conf = new YarnConfiguration();
+    Configuration conf = createDefaultConfig();
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, "0:0,1:1,2:3,3:4");
     gpuDiscoverer.initialize(conf);
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
index 1130c0cf7f6..000b73bf12b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
@@ -1194,8 +1194,8 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
     final Lock rLock = rwLock.readLock();
     final Lock wLock = rwLock.writeLock();
 
+    wLock.lock();
     try {
-      wLock.lock();
       Runnable runnable = new Runnable() {
         @Override
         public void run() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/TestFpgaDiscoverer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/TestFpgaDiscoverer.java
index dd998458954..f2b92d2457a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/TestFpgaDiscoverer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/TestFpgaDiscoverer.java
@@ -24,23 +24,34 @@ import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator;
-import org.junit.Assert;
+import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.fpga.FpgaResourceAllocator.FpgaDevice;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 public class TestFpgaDiscoverer {
+  @Rule
+  public ExpectedException expected = ExpectedException.none();
 
   private String getTestParentFolder() {
     File f = new File("target/temp/" + TestFpgaDiscoverer.class.getName());
@@ -57,6 +68,7 @@ public class TestFpgaDiscoverer {
     File f = new File(folder);
     FileUtils.deleteDirectory(f);
     f.mkdirs();
+    FpgaDiscoverer.reset();
   }
 
   // A dirty hack to modify the env of the current JVM itself - Dirty, but
@@ -106,7 +118,7 @@ public class TestFpgaDiscoverer {
 
     discoverer.initialize(conf);
     // Case 1. No configuration set for binary(no environment "ALTERAOCLSDKROOT" set)
-    Assert.assertEquals("No configuration(no environment ALTERAOCLSDKROOT set)" +
+    assertEquals("No configuration(no environment ALTERAOCLSDKROOT set)" +
             "should return just a single binary name",
         "aocl", openclPlugin.getPathToExecutable());
 
@@ -115,19 +127,19 @@ public class TestFpgaDiscoverer {
     conf.set(YarnConfiguration.NM_FPGA_PATH_TO_EXEC, getTestParentFolder() + "/aocl");
     touchFile(fakeBinary);
     discoverer.initialize(conf);
-    Assert.assertEquals("Correct configuration should return user setting",
+    assertEquals("Correct configuration should return user setting",
         getTestParentFolder() + "/aocl", openclPlugin.getPathToExecutable());
 
     // Case 3. With correct configuration but file doesn't exists. Use default
     fakeBinary.delete();
     discoverer.initialize(conf);
-    Assert.assertEquals("Correct configuration but file doesn't exists should return just a single binary name",
+    assertEquals("Should return just a single binary name",
         "aocl", openclPlugin.getPathToExecutable());
 
     // Case 4. Set a empty value
     conf.set(YarnConfiguration.NM_FPGA_PATH_TO_EXEC, "");
     discoverer.initialize(conf);
-    Assert.assertEquals("configuration with empty string value, should use aocl",
+    assertEquals("configuration with empty string value, should use aocl",
         "aocl", openclPlugin.getPathToExecutable());
 
     // Case 5. No configuration set for binary, but set environment "ALTERAOCLSDKROOT"
@@ -140,7 +152,7 @@ public class TestFpgaDiscoverer {
     newEnv.put("ALTERAOCLSDKROOT", getTestParentFolder());
     setNewEnvironmentHack(newEnv);
     discoverer.initialize(conf);
-    Assert.assertEquals("No configuration but with environment ALTERAOCLSDKROOT set",
+    assertEquals("No configuration but with environment ALTERAOCLSDKROOT set",
         getTestParentFolder() + "/bin/aocl", openclPlugin.getPathToExecutable());
 
   }
@@ -193,39 +205,229 @@ public class TestFpgaDiscoverer {
 
     // Case 1. core parsing
     openclPlugin.parseDiagnoseInfo(output, list);
-    Assert.assertEquals(3, list.size());
-    Assert.assertEquals("IntelOpenCL", list.get(0).getType());
-    Assert.assertEquals("247", list.get(0).getMajor().toString());
-    Assert.assertEquals("0", list.get(0).getMinor().toString());
-    Assert.assertEquals("acl0", list.get(0).getAliasDevName());
-    Assert.assertEquals("aclnalla_pcie0", list.get(0).getDevName());
-    Assert.assertEquals("02:00.00", list.get(0).getBusNum());
-    Assert.assertEquals("53.1 degrees C", list.get(0).getTemperature());
-    Assert.assertEquals("31.7 Watts", list.get(0).getCardPowerUsage());
+    assertEquals(3, list.size());
+    assertEquals("IntelOpenCL", list.get(0).getType());
+    assertEquals("247", list.get(0).getMajor().toString());
+    assertEquals("0", list.get(0).getMinor().toString());
+    assertEquals("acl0", list.get(0).getAliasDevName());
+    assertEquals("aclnalla_pcie0", list.get(0).getDevName());
+    assertEquals("02:00.00", list.get(0).getBusNum());
+    assertEquals("53.1 degrees C", list.get(0).getTemperature());
+    assertEquals("31.7 Watts", list.get(0).getCardPowerUsage());
 
-    Assert.assertEquals("IntelOpenCL", list.get(1).getType());
-    Assert.assertEquals("247", list.get(1).getMajor().toString());
-    Assert.assertEquals("1", list.get(1).getMinor().toString());
-    Assert.assertEquals("acl1", list.get(1).getAliasDevName());
-    Assert.assertEquals("aclnalla_pcie1", list.get(1).getDevName());
-    Assert.assertEquals("03:00.00", list.get(1).getBusNum());
-    Assert.assertEquals("43.1 degrees C", list.get(1).getTemperature());
-    Assert.assertEquals("11.7 Watts", list.get(1).getCardPowerUsage());
+    assertEquals("IntelOpenCL", list.get(1).getType());
+    assertEquals("247", list.get(1).getMajor().toString());
+    assertEquals("1", list.get(1).getMinor().toString());
+    assertEquals("acl1", list.get(1).getAliasDevName());
+    assertEquals("aclnalla_pcie1", list.get(1).getDevName());
+    assertEquals("03:00.00", list.get(1).getBusNum());
+    assertEquals("43.1 degrees C", list.get(1).getTemperature());
+    assertEquals("11.7 Watts", list.get(1).getCardPowerUsage());
 
-    Assert.assertEquals("IntelOpenCL", list.get(2).getType());
-    Assert.assertEquals("246", list.get(2).getMajor().toString());
-    Assert.assertEquals("0", list.get(2).getMinor().toString());
-    Assert.assertEquals("acl2", list.get(2).getAliasDevName());
-    Assert.assertEquals("acla10_ref0", list.get(2).getDevName());
-    Assert.assertEquals("09:00.00", list.get(2).getBusNum());
-    Assert.assertEquals("50.5781 degrees C", list.get(2).getTemperature());
-    Assert.assertEquals("", list.get(2).getCardPowerUsage());
+    assertEquals("IntelOpenCL", list.get(2).getType());
+    assertEquals("246", list.get(2).getMajor().toString());
+    assertEquals("0", list.get(2).getMinor().toString());
+    assertEquals("acl2", list.get(2).getAliasDevName());
+    assertEquals("acla10_ref0", list.get(2).getDevName());
+    assertEquals("09:00.00", list.get(2).getBusNum());
+    assertEquals("50.5781 degrees C", list.get(2).getTemperature());
+    assertEquals("", list.get(2).getCardPowerUsage());
 
     // Case 2. check alias map
     Map<String, String> aliasMap = openclPlugin.getAliasMap();
-    Assert.assertEquals("acl0", aliasMap.get("247:0"));
-    Assert.assertEquals("acl1", aliasMap.get("247:1"));
-    Assert.assertEquals("acl2", aliasMap.get("246:0"));
+    assertEquals("acl0", aliasMap.get("247:0"));
+    assertEquals("acl1", aliasMap.get("247:1"));
+    assertEquals("acl2", aliasMap.get("246:0"));
+  }
+
+  @Test
+  public void testDiscoveryWhenAvailableDevicesDefined()
+      throws YarnException {
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_AVAILABLE_DEVICES,
+        "acl0/243:0,acl1/244:1");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+
+    discoverer.initialize(conf);
+    List<FpgaDevice> devices = discoverer.discover();
+    assertEquals("Number of devices", 2, devices.size());
+    FpgaDevice device0 = devices.get(0);
+    FpgaDevice device1 = devices.get(1);
+
+    assertEquals("Device id", "acl0", device0.getAliasDevName());
+    assertEquals("Minor number", new Integer(0), device0.getMinor());
+    assertEquals("Major", new Integer(243), device0.getMajor());
+
+    assertEquals("Device id", "acl1", device1.getAliasDevName());
+    assertEquals("Minor number", new Integer(1), device1.getMinor());
+    assertEquals("Major", new Integer(244), device1.getMajor());
+  }
+
+  @Test
+  public void testDiscoveryWhenAvailableDevicesEmpty()
+      throws YarnException {
+    expected.expect(ResourceHandlerException.class);
+    expected.expectMessage("No FPGA devices were specified");
+
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_AVAILABLE_DEVICES,
+        "");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+
+    discoverer.initialize(conf);
+    discoverer.discover();
+  }
+
+  @Test
+  public void testDiscoveryWhenAvailableDevicesAreIllegalString()
+      throws YarnException {
+    expected.expect(ResourceHandlerException.class);
+    expected.expectMessage("Illegal device specification string");
+
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_AVAILABLE_DEVICES,
+        "illegal/243:0,acl1/244=1");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+
+    discoverer.initialize(conf);
+    discoverer.discover();
+  }
+
+  @Test
+  public void testDiscoveryWhenExternalScriptDefined()
+      throws YarnException {
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT,
+        "/dummy/script");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+    discoverer.setScriptRunner(s -> {
+      return Optional.of("acl0/243:0,acl1/244:1"); });
+
+    discoverer.initialize(conf);
+    List<FpgaDevice> devices = discoverer.discover();
+    assertEquals("Number of devices", 2, devices.size());
+    FpgaDevice device0 = devices.get(0);
+    FpgaDevice device1 = devices.get(1);
+
+    assertEquals("Device id", "acl0", device0.getAliasDevName());
+    assertEquals("Minor number", new Integer(0), device0.getMinor());
+    assertEquals("Major", new Integer(243), device0.getMajor());
+
+    assertEquals("Device id", "acl1", device1.getAliasDevName());
+    assertEquals("Minor number", new Integer(1), device1.getMinor());
+    assertEquals("Major", new Integer(244), device1.getMajor());
+  }
+
+  @Test
+  public void testDiscoveryWhenExternalScriptReturnsEmptyString()
+      throws YarnException {
+    expected.expect(ResourceHandlerException.class);
+    expected.expectMessage("No FPGA devices were specified");
+
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT,
+        "/dummy/script");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+    discoverer.setScriptRunner(s -> {
+      return Optional.of(""); });
+
+    discoverer.initialize(conf);
+    discoverer.discover();
+  }
+
+  @Test
+
+  public void testDiscoveryWhenExternalScriptFails()
+      throws YarnException {
+    expected.expect(ResourceHandlerException.class);
+    expected.expectMessage("Unable to run external script");
+
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT,
+        "/dummy/script");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+    discoverer.setScriptRunner(s -> {
+      return Optional.empty(); });
+
+    discoverer.initialize(conf);
+    discoverer.discover();
+  }
+
+  @Test
+  public void testDiscoveryWhenExternalScriptUndefined()
+      throws YarnException {
+    expected.expect(ResourceHandlerException.class);
+    expected.expectMessage("Unable to run external script");
+
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT, "");
+    FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+    IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+    discoverer.setResourceHanderPlugin(openclPlugin);
+    openclPlugin.initPlugin(conf);
+    openclPlugin.setShell(mockPuginShell());
+
+    discoverer.initialize(conf);
+    discoverer.discover();
+  }
+
+  @Test
+  public void testDiscoveryWhenExternalScriptCannotBeExecuted()
+      throws YarnException, IOException {
+    File fakeScript = new File(getTestParentFolder() + "/fakeScript");
+    try {
+      expected.expect(ResourceHandlerException.class);
+      expected.expectMessage("Unable to run external script");
+
+      Configuration conf = new Configuration(false);
+      fakeScript = new File(getTestParentFolder() + "/fakeScript");
+      touchFile(fakeScript);
+      fakeScript.setExecutable(false);
+      conf.set(YarnConfiguration.NM_FPGA_DEVICE_DISCOVERY_SCRIPT,
+          fakeScript.getAbsolutePath());
+      FpgaDiscoverer discoverer = FpgaDiscoverer.getInstance();
+
+      IntelFpgaOpenclPlugin openclPlugin = new IntelFpgaOpenclPlugin();
+      discoverer.setResourceHanderPlugin(openclPlugin);
+      openclPlugin.initPlugin(conf);
+      openclPlugin.setShell(mockPuginShell());
+
+      discoverer.initialize(conf);
+      discoverer.discover();
+    } finally {
+      fakeScript.delete();
+    }
   }
 
   private IntelFpgaOpenclPlugin.InnerShellExecutor mockPuginShell() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/TestGpuDiscoverer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/TestGpuDiscoverer.java
index cbbfded374d..ff64e042e19 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/TestGpuDiscoverer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/TestGpuDiscoverer.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugi
 
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.Shell;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.gpu.GpuDeviceInformation;
@@ -28,18 +29,38 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.List;
+import java.util.function.Consumer;
 
+import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows;
+import static org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.gpu.GpuDiscoverer.DEFAULT_BINARY_NAME;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class TestGpuDiscoverer {
+  private static final Logger LOG = LoggerFactory.getLogger(
+      TestGpuDiscoverer.class);
+
+  private static final String PATH = "PATH";
+  private static final String NVIDIA = "nvidia";
+  private static final String EXEC_PERMISSION = "u+x";
+  private static final String BASH_SHEBANG = "#!/bin/bash\n\n";
+  private static final String TEST_PARENT_DIR = new File("target/temp/" +
+      TestGpuDiscoverer.class.getName()).getAbsolutePath();
+
   @Rule
   public ExpectedException exception = ExpectedException.none();
 
@@ -52,10 +73,23 @@ public class TestGpuDiscoverer {
     new FileOutputStream(f).close();
   }
 
+  private File setupFakeBinary(Configuration conf) {
+    File fakeBinary;
+    try {
+      fakeBinary = new File(getTestParentFolder(),
+          GpuDiscoverer.DEFAULT_BINARY_NAME);
+      touchFile(fakeBinary);
+      conf.set(YarnConfiguration.NM_GPU_PATH_TO_EXEC, getTestParentFolder());
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to init fake binary", e);
+    }
+    return fakeBinary;
+  }
+
   @Before
   public void before() throws IOException {
-    String folder = getTestParentFolder();
-    File f = new File(folder);
+    assumeNotWindows();
+    File f = new File(TEST_PARENT_DIR);
     FileUtils.deleteDirectory(f);
     f.mkdirs();
   }
@@ -63,9 +97,59 @@ public class TestGpuDiscoverer {
   private Configuration createConfigWithAllowedDevices(String s) {
     Configuration conf = new Configuration(false);
     conf.set(YarnConfiguration.NM_GPU_ALLOWED_DEVICES, s);
+    setupFakeBinary(conf);
     return conf;
   }
 
+  private void createNvidiaSmiScript(File file) {
+    writeToFile(file, BASH_SHEBANG +
+        "echo '<nvidia_smi_log></nvidia_smi_log>'");
+  }
+
+  private void createFaultyNvidiaSmiScript(File file) {
+    writeToFile(file, BASH_SHEBANG + "echo <<'");
+  }
+
+  private void createNvidiaSmiScriptWithInvalidXml(File file) {
+    writeToFile(file, BASH_SHEBANG + "echo '<nvidia_smi_log></bla>'");
+  }
+
+  private static void writeToFile(File file, String contents) {
+    try {
+      PrintWriter fileWriter = new PrintWriter(file);
+      fileWriter.write(contents);
+      fileWriter.close();
+    } catch (Exception e) {
+      throw new RuntimeException("Error while writing nvidia-smi script file!",
+          e);
+    }
+  }
+
+  private void assertNvidiaIsOnPath(GpuDiscoverer discoverer) {
+    String path = discoverer.getEnvironmentToRunCommand().get(PATH);
+    assertNotNull(path);
+    assertTrue(path.contains(NVIDIA));
+  }
+
+  private File createFakeNvidiaSmiScriptAsRunnableFile(
+      Consumer<File> scriptFileCreator) throws IOException {
+    File fakeBinary = new File(TEST_PARENT_DIR, DEFAULT_BINARY_NAME);
+    touchFile(fakeBinary);
+    scriptFileCreator.accept(fakeBinary);
+    Shell.execCommand(Shell.getSetPermissionCommand(EXEC_PERMISSION, false,
+        fakeBinary.getAbsolutePath()));
+
+    return fakeBinary;
+  }
+
+  private GpuDiscoverer creatediscovererWithGpuPathDefined(
+      Configuration conf) throws YarnException {
+    conf.set(YarnConfiguration.NM_GPU_PATH_TO_EXEC, TEST_PARENT_DIR);
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    return discoverer;
+  }
+
   @Test
   public void testLinuxGpuResourceDiscoverPluginConfig() throws Exception {
     // Only run this on demand.
@@ -74,34 +158,151 @@ public class TestGpuDiscoverer {
 
     // test case 1, check default setting.
     Configuration conf = new Configuration(false);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    assertEquals(GpuDiscoverer.DEFAULT_BINARY_NAME,
-        plugin.getPathOfGpuBinary());
-    assertNotNull(plugin.getEnvironmentToRunCommand().get("PATH"));
-    assertTrue(
-        plugin.getEnvironmentToRunCommand().get("PATH").contains("nvidia"));
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    assertEquals(DEFAULT_BINARY_NAME, discoverer.getPathOfGpuBinary());
+    assertNvidiaIsOnPath(discoverer);
 
     // test case 2, check mandatory set path.
-    File fakeBinary = new File(getTestParentFolder(),
-        GpuDiscoverer.DEFAULT_BINARY_NAME);
-    touchFile(fakeBinary);
-    conf.set(YarnConfiguration.NM_GPU_PATH_TO_EXEC, getTestParentFolder());
-    plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
+    File fakeBinary = setupFakeBinary(conf);
+    discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
     assertEquals(fakeBinary.getAbsolutePath(),
-        plugin.getPathOfGpuBinary());
-    assertNull(plugin.getEnvironmentToRunCommand().get("PATH"));
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
 
-    // test case 3, check mandatory set path, but binary doesn't exist so default
-    // path will be used.
+    // test case 3, check mandatory set path,
+    // but binary doesn't exist so default path will be used.
     fakeBinary.delete();
-    plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    assertEquals(GpuDiscoverer.DEFAULT_BINARY_NAME,
-        plugin.getPathOfGpuBinary());
-    assertTrue(
-        plugin.getEnvironmentToRunCommand().get("PATH").contains("nvidia"));
+    discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    assertEquals(DEFAULT_BINARY_NAME,
+        discoverer.getPathOfGpuBinary());
+    assertNvidiaIsOnPath(discoverer);
+  }
+
+  @Test
+  public void testGetGpuDeviceInformationValidNvidiaSmiScript()
+      throws YarnException, IOException {
+    Configuration conf = new Configuration(false);
+
+    File fakeBinary = createFakeNvidiaSmiScriptAsRunnableFile(
+        this::createNvidiaSmiScript);
+
+    GpuDiscoverer discoverer = creatediscovererWithGpuPathDefined(conf);
+    assertEquals(fakeBinary.getAbsolutePath(),
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
+
+    GpuDeviceInformation result =
+        discoverer.getGpuDeviceInformation();
+    assertNotNull(result);
+  }
+
+  @Test
+  public void testGetGpuDeviceInformationFakeNvidiaSmiScriptConsecutiveRun()
+      throws YarnException, IOException {
+    Configuration conf = new Configuration(false);
+
+    File fakeBinary = createFakeNvidiaSmiScriptAsRunnableFile(
+        this::createNvidiaSmiScript);
+
+    GpuDiscoverer discoverer = creatediscovererWithGpuPathDefined(conf);
+    assertEquals(fakeBinary.getAbsolutePath(),
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
+
+    for (int i = 0; i < 5; i++) {
+      GpuDeviceInformation result = discoverer.getGpuDeviceInformation();
+      assertNotNull(result);
+    }
+  }
+
+  @Test
+  public void testGetGpuDeviceInformationFaultyNvidiaSmiScript()
+      throws YarnException, IOException {
+    Configuration conf = new Configuration(false);
+
+    File fakeBinary = createFakeNvidiaSmiScriptAsRunnableFile(
+        this::createFaultyNvidiaSmiScript);
+
+    GpuDiscoverer discoverer = creatediscovererWithGpuPathDefined(conf);
+    assertEquals(fakeBinary.getAbsolutePath(),
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
+
+    exception.expect(YarnException.class);
+    exception.expectMessage("Failed to execute GPU device detection script");
+    discoverer.getGpuDeviceInformation();
+  }
+
+  @Test
+  public void testGetGpuDeviceInformationFaultyNvidiaSmiScriptConsecutiveRun()
+      throws YarnException, IOException {
+    Configuration conf = new Configuration(false);
+
+    File fakeBinary = createFakeNvidiaSmiScriptAsRunnableFile(
+        this::createNvidiaSmiScript);
+
+    GpuDiscoverer discoverer = creatediscovererWithGpuPathDefined(conf);
+    assertEquals(fakeBinary.getAbsolutePath(),
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
+
+    LOG.debug("Querying nvidia-smi correctly, once...");
+    discoverer.getGpuDeviceInformation();
+
+    LOG.debug("Replacing script with faulty version!");
+    createFaultyNvidiaSmiScript(fakeBinary);
+
+    final String terminateMsg = "Failed to execute GPU device " +
+        "detection script (" + fakeBinary.getAbsolutePath() + ") for 10 times";
+    final String msg = "Failed to execute GPU device detection script";
+
+    for (int i = 0; i < 10; i++) {
+      try {
+        LOG.debug("Executing faulty nvidia-smi script...");
+        discoverer.getGpuDeviceInformation();
+        fail("Query of GPU device info via nvidia-smi should fail as " +
+            "script should be faulty: " + fakeBinary);
+      } catch (YarnException e) {
+        assertThat(e.getMessage(), containsString(msg));
+        assertThat(e.getMessage(), not(containsString(terminateMsg)));
+      }
+    }
+
+    try {
+      LOG.debug("Executing faulty nvidia-smi script again..." +
+          "We should reach the error threshold now!");
+      discoverer.getGpuDeviceInformation();
+      fail("Query of GPU device info via nvidia-smi should fail as " +
+          "script should be faulty: " + fakeBinary);
+    } catch (YarnException e) {
+      assertThat(e.getMessage(), containsString(terminateMsg));
+    }
+
+    LOG.debug("Verifying if GPUs are still hold the value of " +
+        "first successful query");
+    assertNotNull(discoverer.getGpusUsableByYarn());
+  }
+
+  @Test
+  public void testGetGpuDeviceInformationNvidiaSmiScriptWithInvalidXml()
+      throws YarnException, IOException {
+    Configuration conf = new Configuration(false);
+
+    File fakeBinary = createFakeNvidiaSmiScriptAsRunnableFile(
+        this::createNvidiaSmiScriptWithInvalidXml);
+
+    GpuDiscoverer discoverer = creatediscovererWithGpuPathDefined(conf);
+    assertEquals(fakeBinary.getAbsolutePath(),
+        discoverer.getPathOfGpuBinary());
+    assertNull(discoverer.getEnvironmentToRunCommand().get(PATH));
+
+    exception.expect(YarnException.class);
+    exception.expectMessage("Failed to parse XML output of " +
+        "GPU device detection script");
+    discoverer.getGpuDeviceInformation();
   }
 
   @Test
@@ -111,12 +312,12 @@ public class TestGpuDiscoverer {
     Assume.assumeTrue(
         Boolean.valueOf(System.getProperty("runGpuDiscoverUnitTest")));
     Configuration conf = new Configuration(false);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    GpuDeviceInformation info = plugin.getGpuDeviceInformation();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    GpuDeviceInformation info = discoverer.getGpuDeviceInformation();
 
     assertTrue(info.getGpus().size() > 0);
-    assertEquals(plugin.getGpusUsableByYarn().size(),
+    assertEquals(discoverer.getGpusUsableByYarn().size(),
         info.getGpus().size());
   }
 
@@ -125,9 +326,9 @@ public class TestGpuDiscoverer {
       throws YarnException {
     Configuration conf = createConfigWithAllowedDevices("1:2");
 
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    List<GpuDevice> usableGpuDevices = plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    List<GpuDevice> usableGpuDevices = discoverer.getGpusUsableByYarn();
     assertEquals(1, usableGpuDevices.size());
 
     assertEquals(1, usableGpuDevices.get(0).getIndex());
@@ -140,18 +341,18 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0:0,1:1,2:2,3");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
   public void testGetNumberOfUsableGpusFromConfig() throws YarnException {
     Configuration conf = createConfigWithAllowedDevices("0:0,1:1,2:2,3:4");
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
 
-    List<GpuDevice> usableGpuDevices = plugin.getGpusUsableByYarn();
+    List<GpuDevice> usableGpuDevices = discoverer.getGpusUsableByYarn();
     assertEquals(4, usableGpuDevices.size());
 
     assertEquals(0, usableGpuDevices.get(0).getIndex());
@@ -173,9 +374,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0:0,1:1,2:2,1:1");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -184,9 +385,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0:0,1:1,2:2,1:1,2:2");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -195,9 +396,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0 : 0,1 : 1");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -206,9 +407,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0:@$1,1:1");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -217,9 +418,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("x:0, 1:y");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -228,9 +429,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices(":0, :1");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -239,9 +440,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -250,9 +451,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0:0 0:1");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -261,9 +462,9 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0.1 0.2");
 
     exception.expect(GpuDeviceSpecificationException.class);
-    GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
   }
 
   @Test
@@ -272,8 +473,26 @@ public class TestGpuDiscoverer {
     Configuration conf = createConfigWithAllowedDevices("0.1,0.2");
 
     exception.expect(GpuDeviceSpecificationException.class);
+    GpuDiscoverer discoverer = new GpuDiscoverer();
+    discoverer.initialize(conf);
+    discoverer.getGpusUsableByYarn();
+  }
+
+  @Test
+  public void testGpuBinaryIsANotExistingFile() {
+    Configuration conf = new Configuration(false);
+    conf.set(YarnConfiguration.NM_GPU_PATH_TO_EXEC, "/blabla");
     GpuDiscoverer plugin = new GpuDiscoverer();
-    plugin.initialize(conf);
-    plugin.getGpusUsableByYarn();
+    try {
+      plugin.initialize(conf);
+      plugin.getGpusUsableByYarn();
+      fail("Illegal format, should fail.");
+    } catch (YarnException e) {
+      String message = e.getMessage();
+      assertTrue(message.startsWith("Failed to find GPU discovery " +
+          "executable, please double check"));
+      assertTrue(message.contains("Also tried to find the " +
+          "executable in the default directories:"));
+    }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AMSProcessingChain.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AMSProcessingChain.java
index 7ae23e7bb63..5d0b2983196 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AMSProcessingChain.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AMSProcessingChain.java
@@ -18,8 +18,6 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceContext;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceProcessor;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
@@ -31,6 +29,8 @@ import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRespo
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
@@ -39,7 +39,8 @@ import java.io.IOException;
  */
 class AMSProcessingChain implements ApplicationMasterServiceProcessor {
 
-  private static final Log LOG = LogFactory.getLog(AMSProcessingChain.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AMSProcessingChain.class);
 
   private ApplicationMasterServiceProcessor head;
   private RMContext rmContext;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java
index c5c9211d7d9..d1ef5c8abf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -52,8 +52,8 @@ import java.util.TimerTask;
 public class ActiveStandbyElectorBasedElectorService extends AbstractService
     implements EmbeddedElector,
     ActiveStandbyElector.ActiveStandbyElectorCallback {
-  private static final Log LOG = LogFactory.getLog(
-      ActiveStandbyElectorBasedElectorService.class.getName());
+  private static final Logger LOG = LoggerFactory.
+      getLogger(ActiveStandbyElectorBasedElectorService.class.getName());
   private static final HAServiceProtocol.StateChangeRequestInfo req =
       new HAServiceProtocol.StateChangeRequestInfo(
           HAServiceProtocol.RequestSource.REQUEST_BY_ZKFC);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
index e97a13b1752..9f4ae1d8c79 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -110,7 +110,8 @@ import com.google.protobuf.BlockingService;
 public class AdminService extends CompositeService implements
     HAServiceProtocol, ResourceManagerAdministrationProtocol {
 
-  private static final Log LOG = LogFactory.getLog(AdminService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AdminService.class);
 
   private final ResourceManager rm;
   private String rmId;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
index 7bc4260ca08..a99da2cc407 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -83,7 +83,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 public class ApplicationMasterService extends AbstractService implements
     ApplicationMasterProtocol {
-  private static final Log LOG = LogFactory.getLog(ApplicationMasterService.class);
+  private static final Logger LOG = LoggerFactory.
+      getLogger(ApplicationMasterService.class);
 
   private final AMLivelinessMonitor amLivelinessMonitor;
   private YarnScheduler rScheduler;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
index 184482621b1..55ea5565a4d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
@@ -40,8 +40,8 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.cli.UnrecognizedOptionException;
 import org.apache.commons.lang3.Range;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -209,7 +209,8 @@ public class ClientRMService extends AbstractService implements
     ApplicationClientProtocol {
   private static final ArrayList<ApplicationReport> EMPTY_APPS_REPORT = new ArrayList<ApplicationReport>();
 
-  private static final Log LOG = LogFactory.getLog(ClientRMService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ClientRMService.class);
 
   final private AtomicInteger applicationCounter = new AtomicInteger(0);
   final private YarnScheduler scheduler;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/CuratorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/CuratorBasedElectorService.java
index d7485f531b5..660b118faff 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/CuratorBasedElectorService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/CuratorBasedElectorService.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.leader.LeaderLatch;
 import org.apache.curator.framework.recipes.leader.LeaderLatchListener;
@@ -41,8 +41,8 @@ import java.io.IOException;
 @InterfaceStability.Unstable
 public class CuratorBasedElectorService extends AbstractService
     implements EmbeddedElector, LeaderLatchListener {
-  public static final Log LOG =
-      LogFactory.getLog(CuratorBasedElectorService.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(CuratorBasedElectorService.class);
   private LeaderLatch leaderLatch;
   private CuratorFramework curator;
   private String latchPath;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java
index ca3eb798414..83c1916d839 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java
@@ -25,8 +25,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerState;
@@ -67,8 +67,8 @@ import org.apache.hadoop.yarn.util.MonotonicClock;
  * (the affected map tasks will be rescheduled).
  */
 public class DecommissioningNodesWatcher {
-  private static final Log LOG =
-      LogFactory.getLog(DecommissioningNodesWatcher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DecommissioningNodesWatcher.class);
 
   private final RMContext rmContext;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java
index 9e05edae440..d25742e613c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceContext;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceUtils;
@@ -103,7 +103,8 @@ import static org.apache.hadoop.yarn.exceptions
  */
 final class DefaultAMSProcessor implements ApplicationMasterServiceProcessor {
 
-  private static final Log LOG = LogFactory.getLog(DefaultAMSProcessor.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DefaultAMSProcessor.class);
 
   private final static List<Container> EMPTY_CONTAINER_LIST =
       new ArrayList<Container>();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
index a73a842f52d..f725ac9376e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
@@ -31,8 +31,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.Node;
@@ -66,7 +66,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class NodesListManager extends CompositeService implements
     EventHandler<NodesListManagerEvent> {
 
-  private static final Log LOG = LogFactory.getLog(NodesListManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodesListManager.class);
 
   private HostsFileReader hostsReader;
   private Configuration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/OpportunisticContainerAllocatorAMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/OpportunisticContainerAllocatorAMService.java
index 562b54ac711..0f00d4bff9b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/OpportunisticContainerAllocatorAMService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/OpportunisticContainerAllocatorAMService.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.RPC;
 import org.apache.hadoop.ipc.Server;
@@ -95,8 +95,8 @@ public class OpportunisticContainerAllocatorAMService
     extends ApplicationMasterService implements DistributedSchedulingAMProtocol,
     EventHandler<SchedulerEvent> {
 
-  private static final Log LOG =
-      LogFactory.getLog(OpportunisticContainerAllocatorAMService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(OpportunisticContainerAllocatorAMService.class);
 
   private final NodeQueueLoadMonitor nodeMonitor;
   private final OpportunisticContainerAllocator oppContainerAllocator;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
index bcedb037b28..f1b0c794031 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -70,8 +70,8 @@ import org.apache.hadoop.yarn.util.SystemClock;
 @Unstable
 public class RMActiveServiceContext {
 
-  private static final Log LOG = LogFactory
-      .getLog(RMActiveServiceContext.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMActiveServiceContext.class);
 
   private final ConcurrentMap<ApplicationId, RMApp> applications =
       new ConcurrentHashMap<ApplicationId, RMApp>();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
index 0679b0eec61..10f57745ddd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.security.AccessControlException;
@@ -82,7 +82,8 @@ import org.apache.hadoop.yarn.util.StringHelper;
 public class RMAppManager implements EventHandler<RMAppManagerEvent>, 
                                         Recoverable {
 
-  private static final Log LOG = LogFactory.getLog(RMAppManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAppManager.class);
 
   private int maxCompletedAppsInMemory;
   private int maxCompletedAppsInStateStore;
@@ -124,7 +125,8 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
    *  This class is for logging the application summary.
    */
   static class ApplicationSummary {
-    static final Log LOG = LogFactory.getLog(ApplicationSummary.class);
+    static final Logger LOG = LoggerFactory.
+        getLogger(ApplicationSummary.class);
 
     // Escape sequences 
     static final char EQUALS = '=';
@@ -214,7 +216,7 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
      */
     public static void logAppSummary(RMApp app) {
       if (app != null) {
-        LOG.info(createAppSummary(app));
+        LOG.info(createAppSummary(app).toString());
       }
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java
index 292aa8b87ea..b7fdc63498f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAuditLogger.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.ipc.CallerContext;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -35,7 +35,8 @@ import org.apache.hadoop.yarn.api.records.Resource;
  * Audit log format is written as key=value pairs. Tab separated.
  */
 public class RMAuditLogger {
-  private static final Log LOG = LogFactory.getLog(RMAuditLogger.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAuditLogger.class);
 
   enum Keys {USER, OPERATION, TARGET, RESULT, IP, PERMISSIONS,
                     DESCRIPTION, APPID, APPATTEMPTID, CONTAINERID, 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
index 716e06fedb0..54e0281f7e8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
@@ -22,8 +22,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -83,7 +83,8 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
  */
 public class RMContextImpl implements RMContext {
 
-  private static final Log LOG = LogFactory.getLog(RMContextImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMContextImpl.class);
   private static final String UNAVAILABLE = "N/A";
   /**
    * RM service contexts which runs through out RM life span. These are created
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java
index c863889f12a..920a2fd7f04 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMCriticalThreadUncaughtExceptionHandler.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 
@@ -35,7 +35,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
 @Private
 public class RMCriticalThreadUncaughtExceptionHandler
     implements UncaughtExceptionHandler {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       RMCriticalThreadUncaughtExceptionHandler.class);
   private final RMContext rmContext;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
index 1b7ddd3b278..4a5da029fd4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMNMInfo.java
@@ -27,8 +27,8 @@ import java.util.List;
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
@@ -39,7 +39,8 @@ import org.eclipse.jetty.util.ajax.JSON;
  * JMX bean listing statuses of all node managers.
  */
 public class RMNMInfo implements RMNMInfoBeans {
-  private static final Log LOG = LogFactory.getLog(RMNMInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMNMInfo.class);
   private RMContext rmContext;
   private ResourceScheduler scheduler;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
index bad890fbfdb..2c1cbbe1af2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java
@@ -31,8 +31,8 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -89,7 +89,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
  */
 public class RMServerUtils {
 
-  private static final Log LOG_HANDLE = LogFactory.getLog(RMServerUtils.class);
+  private static final Logger LOG_HANDLE =
+      LoggerFactory.getLogger(RMServerUtils.class);
 
   public static final String UPDATE_OUTSTANDING_ERROR =
       "UPDATE_OUTSTANDING_ERROR";
@@ -377,7 +378,7 @@ public class RMServerUtils {
   }
 
   public static UserGroupInformation verifyAdminAccess(
-      YarnAuthorizationProvider authorizer, String method, final Log LOG)
+      YarnAuthorizationProvider authorizer, String method, final Logger LOG)
       throws IOException {
     // by default, this method will use AdminService as module name
     return verifyAdminAccess(authorizer, method, "AdminService", LOG);
@@ -396,7 +397,7 @@ public class RMServerUtils {
    */
   public static UserGroupInformation verifyAdminAccess(
       YarnAuthorizationProvider authorizer, String method, String module,
-      final Log LOG)
+      final Logger LOG)
       throws IOException {
     UserGroupInformation user;
     try {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 69d50f217e8..36a87dc231d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -21,8 +21,10 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.jersey.spi.container.servlet.ServletContainer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.apache.curator.framework.AuthInfo;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -164,7 +166,9 @@ public class ResourceManager extends CompositeService
    */
   public static final int EPOCH_BIT_SHIFT = 40;
 
-  private static final Log LOG = LogFactory.getLog(ResourceManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ResourceManager.class);
+  private static final Marker FATAL = MarkerFactory.getMarker("FATAL");
   private static long clusterTimeStamp = System.currentTimeMillis();
 
   /*
@@ -950,15 +954,16 @@ public class ResourceManager extends CompositeService
         // how depends on the event.
         switch(event.getType()) {
         case STATE_STORE_FENCED:
-          LOG.fatal("State store fenced even though the resource manager " +
-              "is not configured for high availability. Shutting down this " +
-              "resource manager to protect the integrity of the state store.");
+          LOG.error(FATAL, "State store fenced even though the resource " +
+              "manager is not configured for high availability. Shutting " +
+              "down this resource manager to protect the integrity of the " +
+              "state store.");
           ExitUtil.terminate(1, event.getExplanation());
           break;
         case STATE_STORE_OP_FAILED:
           if (YarnConfiguration.shouldRMFailFast(getConfig())) {
-            LOG.fatal("Shutting down the resource manager because a state " +
-                "store operation failed, and the resource manager is " +
+            LOG.error(FATAL, "Shutting down the resource manager because a " +
+                "state store operation failed, and the resource manager is " +
                 "configured to fail fast. See the yarn.fail-fast and " +
                 "yarn.resourcemanager.fail-fast properties.");
             ExitUtil.terminate(1, event.getExplanation());
@@ -970,7 +975,7 @@ public class ResourceManager extends CompositeService
           }
           break;
         default:
-          LOG.fatal("Shutting down the resource manager.");
+          LOG.error(FATAL, "Shutting down the resource manager.");
           ExitUtil.terminate(1, event.getExplanation());
         }
       }
@@ -1019,7 +1024,7 @@ public class ResourceManager extends CompositeService
             elector.rejoinElection();
           }
         } catch (Exception e) {
-          LOG.fatal("Failed to transition RM to Standby mode.", e);
+          LOG.error(FATAL, "Failed to transition RM to Standby mode.", e);
           ExitUtil.terminate(1, e);
         }
       }
@@ -1556,7 +1561,7 @@ public class ResourceManager extends CompositeService
         resourceManager.start();
       }
     } catch (Throwable t) {
-      LOG.fatal("Error starting ResourceManager", t);
+      LOG.error(FATAL, "Error starting ResourceManager", t);
       System.exit(-1);
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index 9365096fa63..0cf7697207d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
@@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.commons.collections.CollectionUtils;
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.ipc.Server;
@@ -98,7 +98,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class ResourceTrackerService extends AbstractService implements
     ResourceTracker {
 
-  private static final Log LOG = LogFactory.getLog(ResourceTrackerService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ResourceTrackerService.class);
 
   private static final RecordFactory recordFactory = 
     RecordFactoryProvider.getRecordFactory(null);
@@ -881,7 +882,7 @@ public class ResourceTrackerService extends AbstractService implements
           .append("} reported from NM with ID ").append(nodeId)
           .append(" was rejected from RM with exception message as : ")
           .append(ex.getMessage());
-      LOG.error(errorMessage, ex);
+      LOG.error(errorMessage.toString(), ex);
       throw new IOException(errorMessage.toString(), ex);
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
index 19c5c27f961..d1639655600 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -69,8 +69,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Unstable
 public class RMApplicationHistoryWriter extends CompositeService {
 
-  public static final Log LOG = LogFactory
-    .getLog(RMApplicationHistoryWriter.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(RMApplicationHistoryWriter.class);
 
   private Dispatcher dispatcher;
   @VisibleForTesting
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
index 05787fe5a02..c8595fdba9b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.DataInputByteBuffer;
@@ -75,7 +75,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 public class AMLauncher implements Runnable {
 
-  private static final Log LOG = LogFactory.getLog(AMLauncher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AMLauncher.class);
 
   private ContainerManagementProtocol containerMgrProxy;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
index 0d172f4c1a4..55c35e3a9e0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
@@ -24,8 +24,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.service.AbstractService;
@@ -37,7 +37,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 
 public class ApplicationMasterLauncher extends AbstractService implements
     EventHandler<AMLauncherEvent> {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       ApplicationMasterLauncher.class);
   private ThreadPoolExecutor launcherPool;
   private LauncherThread launcherHandlingThread;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java
index e74895593d1..27289cce530 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/blacklist/SimpleBlacklistManager.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.blacklist;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ResourceBlacklistRequest;
 
 import java.util.ArrayList;
@@ -40,7 +40,8 @@ public class SimpleBlacklistManager implements BlacklistManager {
   private final Set<String> blacklistNodes = new HashSet<>();
   private static final ArrayList<String> EMPTY_LIST = new ArrayList<>();
 
-  private static final Log LOG = LogFactory.getLog(SimpleBlacklistManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SimpleBlacklistManager.class);
 
   public SimpleBlacklistManager(int numberOfNodeManagerHosts,
       double blacklistDisableFailureThreshold) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV1Publisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV1Publisher.java
index dc5292bdbf9..5a5fa11cc64 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV1Publisher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV1Publisher.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.metrics;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -51,8 +51,8 @@ import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
  */
 public class TimelineServiceV1Publisher extends AbstractSystemMetricsPublisher {
 
-  private static final Log LOG =
-      LogFactory.getLog(TimelineServiceV1Publisher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineServiceV1Publisher.class);
 
   public TimelineServiceV1Publisher() {
     super("TimelineserviceV1Publisher");
@@ -121,6 +121,19 @@ public class TimelineServiceV1Publisher extends AbstractSystemMetricsPublisher {
         SystemMetricsEventType.PUBLISH_ENTITY, entity, app.getApplicationId()));
   }
 
+  @Override
+  public void appLaunched(RMApp app, long launchTime) {
+    TimelineEntity entity = createApplicationEntity(app.getApplicationId());
+
+    TimelineEvent tEvent = new TimelineEvent();
+    tEvent.setEventType(ApplicationMetricsConstants.LAUNCHED_EVENT_TYPE);
+    tEvent.setTimestamp(launchTime);
+    entity.addEvent(tEvent);
+
+    getDispatcher().getEventHandler().handle(new TimelineV1PublishEvent(
+        SystemMetricsEventType.PUBLISH_ENTITY, entity, app.getApplicationId()));
+  }
+
   @Override
   public void appFinished(RMApp app, RMAppState state, long finishedTime) {
     TimelineEntity entity = createApplicationEntity(app.getApplicationId());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java
index e93c26d6b9d..92e8880e007 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -71,8 +71,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 @Unstable
 public class TimelineServiceV2Publisher extends AbstractSystemMetricsPublisher {
-  private static final Log LOG =
-      LogFactory.getLog(TimelineServiceV2Publisher.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimelineServiceV2Publisher.class);
   private RMTimelineCollectorManager rmTimelineCollectorManager;
   private boolean publishContainerEvents;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitor.java
index d1cc8501a92..32030709f35 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitor.java
@@ -23,8 +23,8 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
@@ -34,7 +34,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class SchedulingMonitor extends AbstractService {
 
   private final SchedulingEditPolicy scheduleEditPolicy;
-  private static final Log LOG = LogFactory.getLog(SchedulingMonitor.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SchedulingMonitor.class);
 
   // ScheduledExecutorService which schedules the PreemptionChecker to run
   // periodically.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitorManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitorManager.java
index 0cc700d9c11..adb7835df7c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitorManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/SchedulingMonitorManager.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.monitor;
 
 import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -36,7 +36,7 @@ import java.util.Set;
  * Manages scheduling monitors.
  */
 public class SchedulingMonitorManager {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       SchedulingMonitorManager.class);
 
   private Map<String, SchedulingMonitor> runningSchedulingMonitors =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java
index c2735f15f19..d8150f081ab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoCandidatesSelector.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
@@ -40,8 +40,8 @@ import java.util.TreeSet;
 
 public class FifoCandidatesSelector
     extends PreemptionCandidatesSelector {
-  private static final Log LOG =
-      LogFactory.getLog(FifoCandidatesSelector.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FifoCandidatesSelector.class);
   private PreemptableResourceCalculator preemptableAmountCalculator;
   private boolean allowQueuesBalanceAfterAllQueuesSatisfied;
 
@@ -96,8 +96,8 @@ public class FifoCandidatesSelector
               .getResToObtainByPartitionForLeafQueue(preemptionContext,
                   queueName, clusterResource);
 
+      leafQueue.getReadLock().lock();
       try {
-        leafQueue.getReadLock().lock();
         // go through all ignore-partition-exclusivity containers first to make
         // sure such containers will be preemptionCandidates first
         Map<String, TreeSet<RMContainer>> ignorePartitionExclusivityContainers =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java
index 12c178c16dd..2e69b9f1b15 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/FifoIntraQueuePreemptionPlugin.java
@@ -30,8 +30,8 @@ import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.IntraQueueCandidatesSelector.TAFairOrderingComparator;
@@ -58,8 +58,8 @@ public class FifoIntraQueuePreemptionPlugin
   protected final CapacitySchedulerPreemptionContext context;
   protected final ResourceCalculator rc;
 
-  private static final Log LOG =
-      LogFactory.getLog(FifoIntraQueuePreemptionPlugin.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FifoIntraQueuePreemptionPlugin.class);
 
   public FifoIntraQueuePreemptionPlugin(ResourceCalculator rc,
       CapacitySchedulerPreemptionContext preemptionContext) {
@@ -185,7 +185,7 @@ public class FifoIntraQueuePreemptionPlugin
     if (LOG.isDebugEnabled()) {
       LOG.debug("Queue Name:" + tq.queueName + ", partition:" + tq.partition);
       for (TempAppPerPartition tmpApp : tq.getApps()) {
-        LOG.debug(tmpApp);
+        LOG.debug(tmpApp.toString());
       }
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java
index c52fd957c4c..3780c737520 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/IntraQueueCandidatesSelector.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -107,8 +107,8 @@ public class IntraQueueCandidatesSelector extends PreemptionCandidatesSelector {
   IntraQueuePreemptionComputePlugin fifoPreemptionComputePlugin = null;
   final CapacitySchedulerPreemptionContext context;
 
-  private static final Log LOG =
-      LogFactory.getLog(IntraQueueCandidatesSelector.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(IntraQueueCandidatesSelector.class);
 
   IntraQueueCandidatesSelector(
       CapacitySchedulerPreemptionContext preemptionContext) {
@@ -178,8 +178,8 @@ public class IntraQueueCandidatesSelector extends PreemptionCandidatesSelector {
 
         // 7. Based on the selected resource demand per partition, select
         // containers with known policy from inter-queue preemption.
+        leafQueue.getReadLock().lock();
         try {
-          leafQueue.getReadLock().lock();
           for (FiCaSchedulerApp app : apps) {
             preemptFromLeastStarvedApp(leafQueue, app, selectedCandidates,
                 curCandidates, clusterResource, totalPreemptedResourceAllowed,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/PreemptableResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/PreemptableResourceCalculator.java
index 89a015e4122..996d5a06fde 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/PreemptableResourceCalculator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/PreemptableResourceCalculator.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
@@ -38,8 +38,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 public class PreemptableResourceCalculator
     extends
       AbstractPreemptableResourceCalculator {
-  private static final Log LOG =
-      LogFactory.getLog(PreemptableResourceCalculator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PreemptableResourceCalculator.class);
 
   /**
    * PreemptableResourceCalculator constructor
@@ -217,10 +217,7 @@ public class PreemptableResourceCalculator
         } else {
           qT.setActuallyToBePreempted(Resources.none());
         }
-
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(qT);
-        }
+        LOG.debug("{}", qT);
       }
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java
index 2156b0952d4..15513d20c95 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -94,8 +94,8 @@ public class ProportionalCapacityPreemptionPolicy
     PRIORITY_FIRST, USERLIMIT_FIRST;
   }
 
-  private static final Log LOG =
-    LogFactory.getLog(ProportionalCapacityPreemptionPolicy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ProportionalCapacityPreemptionPolicy.class);
 
   private final Clock clock;
 
@@ -566,10 +566,9 @@ public class ProportionalCapacityPreemptionPolicy
       Resource partitionResource, String partitionToLookAt) {
     TempQueuePerPartition ret;
     ReadLock readLock = curQueue.getReadLock();
+    // Acquire a read lock from Parent/LeafQueue.
+    readLock.lock();
     try {
-      // Acquire a read lock from Parent/LeafQueue.
-      readLock.lock();
-
       String queueName = curQueue.getQueueName();
       QueueCapacities qc = curQueue.getQueueCapacities();
       float absCap = qc.getAbsoluteCapacity(partitionToLookAt);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
index 78a99881d67..5e38a9c17c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -45,8 +45,8 @@ import java.util.Set;
 
 public class QueuePriorityContainerCandidateSelector
     extends PreemptionCandidatesSelector {
-  private static final Log LOG =
-      LogFactory.getLog(QueuePriorityContainerCandidateSelector.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(QueuePriorityContainerCandidateSelector.class);
 
   // Configured timeout before doing reserved container preemption
   private long minTimeout;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java
index bdb7e8c4b47..e2f5b4be16a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -37,8 +37,8 @@ import java.util.Set;
 
 public class ReservedContainerCandidatesSelector
     extends PreemptionCandidatesSelector {
-  private static final Log LOG =
-      LogFactory.getLog(ReservedContainerCandidatesSelector.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ReservedContainerCandidatesSelector.class);
 
   private PreemptableResourceCalculator preemptableAmountCalculator;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/FileSystemNodeAttributeStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/FileSystemNodeAttributeStore.java
index 01df25075df..7555a0d468c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/FileSystemNodeAttributeStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/FileSystemNodeAttributeStore.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.nodelabels;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -43,8 +43,8 @@ public class FileSystemNodeAttributeStore
     extends AbstractFSNodeStore<NodeAttributesManager>
     implements NodeAttributeStore {
 
-  protected static final Log LOG =
-      LogFactory.getLog(FileSystemNodeAttributeStore.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(FileSystemNodeAttributeStore.class);
 
   protected static final String DEFAULT_DIR_NAME = "node-attribute";
   protected static final String MIRROR_FILENAME = "nodeattribute.mirror";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java
index 99272d42870..d3edba4d592 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeAttributesManagerImpl.java
@@ -37,8 +37,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.yarn.api.records.NodeAttribute;
@@ -67,8 +67,8 @@ import com.google.common.base.Strings;
  * Manager holding the attributes to Labels.
  */
 public class NodeAttributesManagerImpl extends NodeAttributesManager {
-  protected static final Log LOG =
-      LogFactory.getLog(NodeAttributesManagerImpl.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(NodeAttributesManagerImpl.class);
   /**
    * If a user doesn't specify value for a label, then empty string is
    * considered as default.
@@ -158,9 +158,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
       AttributeMappingOperationType op,
       Map<NodeAttributeKey, RMNodeAttribute> newAttributesToBeAdded,
       String attributePrefix) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // shows node->attributes Mapped as part of this operation.
       StringBuilder logMsg = new StringBuilder(op.name());
       logMsg.append(" attributes on nodes:");
@@ -200,10 +199,7 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
             .append(StringUtils.join(entry.getValue().keySet(), ","))
             .append("] ,");
       }
-
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(logMsg);
-      }
+      LOG.debug("{}", logMsg);
 
       if (null != dispatcher && NodeAttribute.PREFIX_CENTRALIZED
           .equals(attributePrefix)) {
@@ -406,8 +402,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   public Map<NodeAttributeKey,
       Map<String, AttributeValue>> getAttributesToNodes(
       Set<NodeAttributeKey> attributes) {
+    readLock.lock();
     try {
-      readLock.lock();
       boolean fetchAllAttributes = (attributes == null || attributes.isEmpty());
       Map<NodeAttributeKey, Map<String, AttributeValue>> attributesToNodes =
           new HashMap<>();
@@ -426,8 +422,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   }
 
   public Resource getResourceByAttribute(NodeAttribute attribute) {
+    readLock.lock();
     try {
-      readLock.lock();
       return clusterAttributes.containsKey(attribute.getAttributeKey())
           ? clusterAttributes.get(attribute.getAttributeKey()).getResource()
           : Resource.newInstance(0, 0);
@@ -439,8 +435,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   @Override
   public Map<NodeAttribute, AttributeValue> getAttributesForNode(
       String hostName) {
+    readLock.lock();
     try {
-      readLock.lock();
       return nodeCollections.containsKey(hostName)
           ? nodeCollections.get(hostName).getAttributes()
           : new HashMap<>();
@@ -451,8 +447,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
 
   @Override
   public List<NodeToAttributes> getNodeToAttributes(Set<String> prefix) {
+    readLock.lock();
     try {
-      readLock.lock();
       List<NodeToAttributes> nodeToAttributes = new ArrayList<>();
       nodeCollections.forEach((k, v) -> {
         List<NodeAttribute> attrs;
@@ -479,8 +475,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   @Override
   public Map<String, Set<NodeAttribute>> getNodesToAttributes(
       Set<String> hostNames) {
+    readLock.lock();
     try {
-      readLock.lock();
       boolean fetchAllNodes = (hostNames == null || hostNames.isEmpty());
       Map<String, Set<NodeAttribute>> nodeToAttrs = new HashMap<>();
       if (fetchAllNodes) {
@@ -501,8 +497,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   }
 
   public void activateNode(NodeId nodeId, Resource resource) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       String hostName = nodeId.getHost();
       Host host = nodeCollections.get(hostName);
       if (host == null) {
@@ -519,8 +515,8 @@ public class NodeAttributesManagerImpl extends NodeAttributesManager {
   }
 
   public void deactivateNode(NodeId nodeId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Host host = nodeCollections.get(nodeId.getHost());
       for (NodeAttribute attribute : host.getAttributes().keySet()) {
         clusterAttributes.get(attribute.getAttributeKey())
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeLabelsUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeLabelsUtils.java
index 93b901ec493..0306dae12e5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeLabelsUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/NodeLabelsUtils.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.NodeAttribute;
 import org.apache.hadoop.yarn.api.records.NodeLabel;
 
@@ -32,7 +32,8 @@ import org.apache.hadoop.yarn.api.records.NodeLabel;
  * Node labels utilities.
  */
 public final class NodeLabelsUtils {
-  private static final Log LOG = LogFactory.getLog(NodeLabelsUtils.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeLabelsUtils.class);
 
   private NodeLabelsUtils() { /* Hidden constructor */ }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMDelegatedNodeLabelsUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMDelegatedNodeLabelsUpdater.java
index 6e6ab99f065..03a12d50ccb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMDelegatedNodeLabelsUpdater.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMDelegatedNodeLabelsUpdater.java
@@ -27,8 +27,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.service.CompositeService;
 import org.apache.hadoop.yarn.api.records.NodeId;
@@ -47,8 +47,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 public class RMDelegatedNodeLabelsUpdater extends CompositeService {
 
-  private static final Log LOG = LogFactory
-      .getLog(RMDelegatedNodeLabelsUpdater.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMDelegatedNodeLabelsUpdater.class);
 
   public static final long DISABLE_DELEGATED_NODE_LABELS_UPDATE = -1;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
index 507f696d057..370a2f0633d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java
@@ -70,10 +70,9 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
 
   @Override
   public void addLabelsToNode(Map<NodeId, Set<String>> addedLabelsToNode)
-      throws IOException {    
+      throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // get nodesCollection before edition
       Map<String, Host> before = cloneNodeMap(addedLabelsToNode.keySet());
 
@@ -112,8 +111,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   @Override
   public void removeFromClusterNodeLabels(Collection<String> labelsToRemove)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!isInitNodeLabelStoreInProgress()) {
         // We cannot remove node labels from collection when some queue(s) are
         // using any of them.
@@ -137,8 +136,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   @Override
   public void addToCluserNodeLabels(Collection<NodeLabel> labels)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.addToCluserNodeLabels(labels);
     } finally {
       writeLock.unlock();
@@ -149,9 +148,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   public void
       removeLabelsFromNode(Map<NodeId, Set<String>> removeLabelsFromNode)
           throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // get nodesCollection before edition
       Map<String, Host> before =
           cloneNodeMap(removeLabelsFromNode.keySet());
@@ -171,9 +169,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   @Override
   public void replaceLabelsOnNode(Map<NodeId, Set<String>> replaceLabelsToNode)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       Map<NodeId, Set<String>> effectiveModifiedLabelMappings =
           getModifiedNodeLabelsMappings(replaceLabelsToNode);
 
@@ -230,9 +227,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
    * will update running nodes resource
    */
   public void activateNode(NodeId nodeId, Resource resource) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-      
       // save if we have a node before
       Map<String, Host> before = cloneNodeMap(ImmutableSet.of(nodeId));
       
@@ -273,9 +269,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
    * Following methods are used for setting if a node unregistered to RM
    */
   public void deactivateNode(NodeId nodeId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-      
       // save if we have a node before
       Map<String, Host> before = cloneNodeMap(ImmutableSet.of(nodeId));
       Node nm = getNMInNodeSet(nodeId);
@@ -314,8 +309,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   }
 
   public void reinitializeQueueLabels(Map<String, Set<String>> queueToLabels) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // clear before set
       this.queueCollections.clear();
 
@@ -347,8 +342,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   
   public Resource getQueueResource(String queueName, Set<String> queueLabels,
       Resource clusterResource) {
+    readLock.lock();
     try {
-      readLock.lock();
       if (queueLabels.contains(ANY)) {
         return clusterResource;
       }
@@ -369,8 +364,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
     if (label == null) {
       return 0;
     }
+    readLock.lock();
     try {
-      readLock.lock();
       RMNodeLabel labelInfo = labelCollections.get(label);
       return (labelInfo == null) ? 0 : labelInfo.getNumActiveNMs();
     } finally {
@@ -379,8 +374,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   }
 
   public Set<String> getLabelsOnNode(NodeId nodeId) {
+    readLock.lock();
     try {
-      readLock.lock();
       Set<String> nodeLabels = getLabelsByNode(nodeId);
       return Collections.unmodifiableSet(nodeLabels);
     } finally {
@@ -389,8 +384,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   }
   
   public boolean containsNodeLabel(String label) {
+    readLock.lock();
     try {
-      readLock.lock();
       return label != null
           && (label.isEmpty() || labelCollections.containsKey(label));
     } finally {
@@ -522,8 +517,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
     if (label.equals(NO_LABEL)) {
       return noNodeLabel.getResource();
     }
+    readLock.lock();
     try {
-      readLock.lock();
       RMNodeLabel nodeLabel = labelCollections.get(label);
       if (nodeLabel == null) {
         return Resources.none();
@@ -572,8 +567,8 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager {
   }
 
   public List<RMNodeLabel> pullRMNodeLabelsInfo() {
+    readLock.lock();
     try {
-      readLock.lock();
       List<RMNodeLabel> infos = new ArrayList<RMNodeLabel>();
 
       for (Entry<String, RMNodeLabel> entry : labelCollections.entrySet()) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java
index 7a469627527..13eee91e4dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.placement;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
@@ -41,8 +41,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.placement.QueuePlace
 import static org.apache.hadoop.yarn.server.resourcemanager.placement.QueuePlacementRuleUtils.validateAndGetQueueMapping;
 
 public class AppNameMappingPlacementRule extends PlacementRule {
-  private static final Log LOG = LogFactory
-      .getLog(AppNameMappingPlacementRule.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(AppNameMappingPlacementRule.class);
 
   public static final String CURRENT_APP_MAPPING = "%application";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/DefaultPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/DefaultPlacementRule.java
new file mode 100644
index 00000000000..cd6551a822f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/DefaultPlacementRule.java
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
+
+import java.io.IOException;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.isValidQueueName;
+
+/**
+ * Places apps in the specified default queue. If no default queue is
+ * specified the app is placed in root.default queue.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class DefaultPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DefaultPlacementRule.class);
+
+  @VisibleForTesting
+  public String defaultQueueName;
+
+  /**
+   * Set the rule config from the xml config.
+   * @param conf An xml element from the {@link FairScheduler#conf}
+   */
+  @Override
+  public void setConfig(Element conf) {
+    // Get the flag from the config (defaults to true if not set)
+    createQueue = getCreateFlag(conf);
+    // No config can be set when no policy is defined and we use defaults
+    if (conf != null) {
+      defaultQueueName = conf.getAttribute("queue");
+      // A queue read from the config could be illegal check it: fall back to
+      // the config default if it is the case
+      // However we cannot clean the name as a nested name is allowed.
+      if (!isValidQueueName(defaultQueueName)) {
+        LOG.error("Default rule configured with an illegal queue name: '{}'",
+            defaultQueueName);
+        defaultQueueName = null;
+      }
+    }
+    // The queue name does not have to be set and we really use "default"
+    if (defaultQueueName == null || defaultQueueName.isEmpty()) {
+      defaultQueueName = assureRoot(YarnConfiguration.DEFAULT_QUEUE_NAME);
+    } else {
+      defaultQueueName = assureRoot(defaultQueueName);
+    }
+    LOG.debug("Default rule instantiated with queue name: {}, " +
+        "and create flag: {}", defaultQueueName, createQueue);
+  }
+
+  /**
+   * Set the rule config just setting the create flag.
+   * @param create flag to allow queue creation for this rule
+   */
+  @Override
+  public void setConfig(Boolean create) {
+    createQueue = create;
+    // No config so fall back to the real default.
+    defaultQueueName = assureRoot(YarnConfiguration.DEFAULT_QUEUE_NAME);
+    LOG.debug("Default rule instantiated with default queue name: {}, " +
+        "and create flag: {}", defaultQueueName, createQueue);
+  }
+
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    super.initialize(scheduler);
+    if (getParentRule() != null) {
+      throw new IOException(
+          "Parent rule must not be configured for Default rule.");
+    }
+    return true;
+  }
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) {
+
+    // If we can create the queue in the rule or the queue exists return it
+    if (createQueue || configuredQueue(defaultQueueName)) {
+      return new ApplicationPlacementContext(defaultQueueName);
+    }
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FSPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FSPlacementRule.java
new file mode 100644
index 00000000000..7e9e6ef93dc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FSPlacementRule.java
@@ -0,0 +1,166 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueueManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
+
+import java.io.IOException;
+
+/**
+ * Abstract base for all {@link FairScheduler} Placement Rules.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public abstract class FSPlacementRule extends PlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FSPlacementRule.class);
+
+  // Flag to show if the rule can create a queue
+  @VisibleForTesting
+  protected boolean createQueue = true;
+  private QueueManager queueManager;
+  private PlacementRule parentRule;
+
+  /**
+   * Get the {@link QueueManager} loaded from the scheduler when the rule is
+   * initialised. All rules are initialised before the can be called to place
+   * an application.
+   * @return The queue manager from the scheduler, this can never be
+   * <code>null</code> for an initialised rule.
+   */
+  QueueManager getQueueManager() {
+    return queueManager;
+  }
+
+  /**
+   * Set a rule to generate the parent queue dynamically.
+   * @param parent A PlacementRule
+   */
+  void setParentRule(PlacementRule parent) {
+    this.parentRule = parent;
+  }
+
+  /**
+   * Get the rule that is set to generate the parent queue dynamically.
+   * @return The rule set or <code>null</code> if not set.
+   */
+  PlacementRule getParentRule() {
+    return parentRule;
+  }
+
+  /**
+   * Set the config based on the type of object passed in.
+   * @param initArg the config to be set
+   */
+  @Override
+  public void setConfig(Object initArg) {
+    if (null == initArg) {
+      LOG.debug("Null object passed in: no config set");
+      return;
+    }
+    if (initArg instanceof Element) {
+      LOG.debug("Setting config from XML");
+      setConfig((Element) initArg);
+    } else if (initArg instanceof Boolean) {
+      LOG.debug("Setting config from Boolean");
+      setConfig((Boolean) initArg);
+    } else {
+      LOG.info("Unknown object type passed in as config for rule {}: {}",
+          getName(), initArg.getClass());
+    }
+  }
+
+  /**
+   * Set the rule config from the xml config.
+   * @param conf An xml element from the {@link FairScheduler#conf}
+   */
+  protected void setConfig(Element conf) {
+    // Get the flag from the config (defaults to true if not set)
+    createQueue = getCreateFlag(conf);
+  }
+
+  /**
+   * Set the rule config just setting the create flag.
+   * @param create flag to allow queue creation for this rule
+   */
+  protected void setConfig(Boolean create) {
+    createQueue = create;
+  }
+
+  /**
+   * Standard initialisation for {@link FairScheduler} rules, shared by all
+   * rules. Each rule that extends this abstract and overrides this method must
+   * call <code>super.initialize()</code> to run this basic initialisation.
+   * @param scheduler the scheduler using the rule
+   * @return <code>true</code> in all cases
+   * @throws IOException for any errors
+   */
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    if (!(scheduler instanceof FairScheduler)) {
+      throw new IOException(getName() +
+          " rule can only be configured for the FairScheduler");
+    }
+    if (getParentRule() != null &&
+        getParentRule().getName().equals(getName())) {
+      throw new IOException("Parent rule may not be the same type as the " +
+          "child rule: " + getName());
+    }
+
+    FairScheduler fs = (FairScheduler) scheduler;
+    queueManager = fs.getQueueManager();
+
+    return true;
+  }
+
+  /**
+   * Check if the queue exists and is part of the configuration i.e. not
+   * a {@link FSQueue#isDynamic()} queue.
+   * @param queueName name of the queue to check
+   * @return <code>true</code> if the queue exists and is a "configured" queue
+   */
+  boolean configuredQueue(String queueName) {
+    FSQueue queue = queueManager.getQueue(queueName);
+    return (queue != null && !queue.isDynamic());
+  }
+
+  /**
+   * Get the create flag from the xml configuration element.
+   * @param conf The FS configuration element for the queue
+   * @return <code>false</code> only if the flag is set in the configuration to
+   * a text that is not case ignored "true", <code>true</code> in all other
+   * cases
+   */
+  boolean getCreateFlag(Element conf) {
+    if (conf != null) {
+      String create = conf.getAttribute("create");
+      return Boolean.parseBoolean(create);
+    }
+    return true;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FairQueuePlacementUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FairQueuePlacementUtils.java
new file mode 100644
index 00000000000..5663695e399
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/FairQueuePlacementUtils.java
@@ -0,0 +1,100 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerUtilities;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility methods used by Fair scheduler placement rules.
+ * {@link
+ * org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler}
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public final class FairQueuePlacementUtils {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FairQueuePlacementUtils.class);
+
+  // Constants for name clean up and hierarchy checks
+  protected static final String DOT = ".";
+  protected static final String DOT_REPLACEMENT = "_dot_";
+  protected static final String ROOT_QUEUE = "root";
+
+  private FairQueuePlacementUtils() {
+  }
+
+  /**
+   * Replace the periods in the username or group name with "_dot_" and
+   * remove trailing and leading whitespace.
+   *
+   * @param name The name to clean
+   * @return The name with {@link #DOT} replaced with {@link #DOT_REPLACEMENT}
+   */
+  protected static String cleanName(String name) {
+    name = FairSchedulerUtilities.trimQueueName(name);
+    if (name.contains(DOT)) {
+      String converted = name.replaceAll("\\.", DOT_REPLACEMENT);
+      LOG.warn("Name {} is converted to {} when it is used as a queue name.",
+          name, converted);
+      return converted;
+    } else {
+      return name;
+    }
+  }
+
+  /**
+   * Assure root prefix for a queue name.
+   *
+   * @param queueName The queue name to check for the root prefix
+   * @return The root prefixed queue name
+   */
+  protected static String assureRoot(String queueName) {
+    if (queueName != null && !queueName.isEmpty()) {
+      if (!queueName.startsWith(ROOT_QUEUE + DOT) &&
+          !queueName.equals(ROOT_QUEUE)) {
+        queueName = ROOT_QUEUE + DOT + queueName;
+      }
+    } else {
+      LOG.warn("AssureRoot: queueName is empty or null.");
+    }
+    return queueName;
+  }
+
+  /**
+   * Validate the queue name: it may not start or end with a {@link #DOT}.
+   *
+   * @param queueName The queue name to validate
+   * @return <code>false</code> if the queue name starts or ends with a
+   * {@link #DOT}, <code>true</code>
+   */
+  protected static boolean isValidQueueName(String queueName) {
+    if (queueName != null) {
+      if (queueName.equals(FairSchedulerUtilities.trimQueueName(queueName)) &&
+          !queueName.startsWith(DOT) &&
+          !queueName.endsWith(DOT)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementFactory.java
index a5de66463bb..301b3a314dc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementFactory.java
@@ -18,22 +18,35 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.placement;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 
 /**
  * Factory class for creating instances of {@link PlacementRule}.
  */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
 public final class PlacementFactory {
 
-  private static final Log LOG = LogFactory.getLog(PlacementFactory.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PlacementFactory.class);
 
   private PlacementFactory() {
     // Unused.
   }
 
+  /**
+   * Create a new {@link PlacementRule} based on the rule class from the
+   * configuration. This is used to instantiate rules by the scheduler which
+   * does not resolve the class before this call.
+   * @param ruleStr The name of the class to instantiate
+   * @param conf The configuration object to set for the rule
+   * @return Created class instance
+   */
   public static PlacementRule getPlacementRule(String ruleStr,
       Configuration conf)
       throws ClassNotFoundException {
@@ -42,4 +55,20 @@ public final class PlacementFactory {
     LOG.info("Using PlacementRule implementation - " + ruleClass);
     return ReflectionUtils.newInstance(ruleClass, conf);
   }
+
+  /**
+   * Create a new {@link PlacementRule} based on the rule class from the
+   * configuration. This is used to instantiate rules by the scheduler which
+   * resolve the class before this call.
+   * @param ruleClass The specific class reference to instantiate
+   * @param initArg The config to set
+   * @return Created class instance
+   */
+  public static PlacementRule getPlacementRule(
+      Class<? extends PlacementRule> ruleClass, Object initArg) {
+    LOG.info("Creating PlacementRule implementation: " + ruleClass);
+    PlacementRule rule = ReflectionUtils.newInstance(ruleClass, null);
+    rule.setConfig(initArg);
+    return rule;
+  }
 }
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementManager.java
index 74cf7ba19db..6a6c3b93264 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementManager.java
@@ -23,15 +23,16 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 
 import com.google.common.annotations.VisibleForTesting;
 
 public class PlacementManager {  
-  private static final Log LOG = LogFactory.getLog(PlacementManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PlacementManager.class);
 
   List<PlacementRule> rules;
   ReadLock readLock;
@@ -44,8 +45,8 @@ public class PlacementManager {
   }
 
   public void updateRules(List<PlacementRule> rules) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.rules = rules;
     } finally {
       writeLock.unlock();
@@ -54,10 +55,8 @@ public class PlacementManager {
 
   public ApplicationPlacementContext placeApplication(
       ApplicationSubmissionContext asc, String user) throws YarnException {
-
+    readLock.lock();
     try {
-      readLock.lock();
-
       if (null == rules || rules.isEmpty()) {
         return null;
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
index 0f3d43c5ad7..dde632e4db1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
@@ -20,35 +20,62 @@ package org.apache.hadoop.yarn.server.resourcemanager.placement;
 
 import java.io.IOException;
 
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 
+/**
+ * Abstract base for all Placement Rules.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
 public abstract class PlacementRule {
 
+  /**
+   * Set the config based on the passed in argument. This construct is used to
+   * not pollute this abstract class with implementation specific references.
+   */
+  public void setConfig(Object initArg) {
+    // Default is a noop
+  }
+
+  /**
+   * Return the name of the rule.
+   * @return The name of the rule, the fully qualified class name.
+   */
   public String getName() {
     return this.getClass().getName();
   }
 
-  public abstract boolean initialize(
-      ResourceScheduler scheduler) throws IOException;
+  /**
+   * Initialize the rule with the scheduler.
+   * @param scheduler the scheduler using the rule
+   * @return <code>true</code> or <code>false</code> The outcome of the
+   * initialisation, rule dependent response which might not be persisted in
+   * the rule.
+   * @throws IOException for any errors
+   */
+  public abstract boolean initialize(ResourceScheduler scheduler)
+      throws IOException;
 
   /**
-   * Get queue for a given application
+   * Return the scheduler queue name the application should be placed in
+   * wrapped in an {@link ApplicationPlacementContext} object.
+   *
+   * A non <code>null</code> return value places the application in a queue,
+   * a <code>null</code> value means the queue is not yet determined. The
+   * next {@link PlacementRule} in the list maintained in the
+   * {@link PlacementManager} will be executed.
+   *
+   * @param asc The context of the application created on submission
+   * @param user The name of the user submitting the application
    * 
-   * @param asc application submission context
-   * @param user userName
+   * @throws YarnException for any error while executing the rule
    * 
-   * @throws YarnException
-   *           if any error happens
-   * 
-   * @return <p>
-   *         non-null value means it is determined
-   *         </p>
-   *         <p>
-   *         null value means it is undetermined, so next {@link PlacementRule}
-   *         in the {@link PlacementManager} will take care
-   *         </p>
+   * @return The queue name wrapped in {@link ApplicationPlacementContext} or
+   * <code>null</code> if no queue was resolved
    */
   public abstract ApplicationPlacementContext getPlacementForApp(
       ApplicationSubmissionContext asc, String user) throws YarnException;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PrimaryGroupPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PrimaryGroupPlacementRule.java
new file mode 100644
index 00000000000..235af34cf59
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PrimaryGroupPlacementRule.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.security.Groups;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.cleanName;
+
+/**
+ * Places apps in queues by the primary group of the submitter.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class PrimaryGroupPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PrimaryGroupPlacementRule.class);
+
+  private Groups groupProvider;
+
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    super.initialize(scheduler);
+    groupProvider = new Groups(((FairScheduler)scheduler).getConfig());
+
+    return true;
+  }
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) throws YarnException {
+
+    // All users should have at least one group the primary group. If no groups
+    // are returned then there is a real issue.
+    final List<String> groupList;
+    try {
+      groupList = groupProvider.getGroups(user);
+    } catch (IOException ioe) {
+      throw new YarnException("Group resolution failed", ioe);
+    }
+    if (groupList.isEmpty()) {
+      LOG.error("Group placement rule failed: No groups returned for user {}",
+          user);
+      throw new YarnException("No groups returned for user " + user);
+    }
+
+    String cleanGroup = cleanName(groupList.get(0));
+    String queueName;
+    PlacementRule parentRule = getParentRule();
+
+    if (getParentRule() != null) {
+      LOG.debug("PrimaryGroup rule: parent rule found: {}",
+          parentRule.getName());
+      ApplicationPlacementContext parent =
+          parentRule.getPlacementForApp(asc, user);
+      if (parent == null || getQueueManager().
+          getQueue(parent.getQueue()) instanceof FSLeafQueue) {
+        LOG.debug("PrimaryGroup rule: parent rule failed");
+        return null;
+      }
+      LOG.debug("PrimaryGroup rule: parent rule result: {}",
+          parent.getQueue());
+      queueName = parent.getQueue() + DOT + cleanGroup;
+    } else {
+      queueName = assureRoot(cleanGroup);
+    }
+
+    // If we can create the queue in the rule or the queue exists return it
+    if (createQueue || configuredQueue(queueName)) {
+      return new ApplicationPlacementContext(queueName);
+    }
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/RejectPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/RejectPlacementRule.java
new file mode 100644
index 00000000000..d79deeb1f4d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/RejectPlacementRule.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+/**
+ * Rejects all placements.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class RejectPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RejectPlacementRule.class);
+
+  /**
+   * The Reject rule does not use any configuration. Override and ignore all
+   * configuration.
+   * @param initArg the config to be set
+   */
+  @Override
+  public void setConfig(Object initArg) {
+    // This rule ignores all config, just log and return
+    LOG.debug("RejectPlacementRule instantiated");
+  }
+
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    super.initialize(scheduler);
+    if (getParentRule() != null) {
+      throw new IOException(
+          "Parent rule should not be configured for Reject rule.");
+    }
+    return true;
+  }
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) {
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SecondaryGroupExistingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SecondaryGroupExistingPlacementRule.java
new file mode 100644
index 00000000000..374714c2257
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SecondaryGroupExistingPlacementRule.java
@@ -0,0 +1,102 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.security.Groups;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.cleanName;
+
+/**
+ * Places apps in queues by the secondary group of the submitter, if the
+ * submitter is a member of more than one group.
+ * The first "matching" queue based on the group list is returned. The match
+ * takes into account the parent rule and create flag,
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class SecondaryGroupExistingPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SecondaryGroupExistingPlacementRule.class);
+
+  private Groups groupProvider;
+
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    super.initialize(scheduler);
+    groupProvider = new Groups(((FairScheduler)scheduler).getConfig());
+
+    return true;
+  }
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) throws YarnException {
+
+    // All users should have at least one group the primary group. If no groups
+    // are returned then there is a real issue.
+    final List<String> groupList;
+    try {
+      groupList = groupProvider.getGroups(user);
+    } catch (IOException ioe) {
+      throw new YarnException("Group resolution failed", ioe);
+    }
+
+    String parentQueue = null;
+    PlacementRule parentRule = getParentRule();
+
+    if (parentRule != null) {
+      LOG.debug("SecondaryGroupExisting rule: parent rule found: {}",
+          parentRule.getName());
+      ApplicationPlacementContext parent =
+          parentRule.getPlacementForApp(asc, user);
+      if (parent == null || getQueueManager().
+          getQueue(parent.getQueue()) instanceof FSLeafQueue) {
+        LOG.debug("SecondaryGroupExisting rule: parent rule failed");
+        return null;
+      }
+      parentQueue = parent.getQueue();
+      LOG.debug("SecondaryGroupExisting rule: parent rule result: {}",
+          parentQueue);
+    }
+    // now check the groups inside the parent
+    for (int i = 1; i < groupList.size(); i++) {
+      String group = cleanName(groupList.get(i));
+      String queueName =
+          parentQueue == null ? assureRoot(group) : parentQueue + DOT + group;
+      if (configuredQueue(queueName)) {
+        return new ApplicationPlacementContext(queueName);
+      }
+    }
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SpecifiedPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SpecifiedPlacementRule.java
new file mode 100644
index 00000000000..2c5c984ec92
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/SpecifiedPlacementRule.java
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.isValidQueueName;
+
+/**
+ * Places apps in queues by requested queue of the submitter.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class SpecifiedPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SpecifiedPlacementRule.class);
+
+  @Override
+  public boolean initialize(ResourceScheduler scheduler) throws IOException {
+    super.initialize(scheduler);
+    if (getParentRule() != null) {
+      throw new IOException(
+          "Parent rule should not be configured for Specified rule.");
+    }
+    return true;
+  }
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) throws YarnException {
+
+    // Sanity check the provided queue
+    String queueName = asc.getQueue();
+    if (!isValidQueueName(queueName)) {
+      LOG.error("Specified queue name not valid: '{}'", queueName);
+      throw new YarnException("Application submitted by user " + user +
+          "with illegal queue name '" + queueName + "'.");
+    }
+    // On submission the requested queue will be set to "default" if no queue
+    // is specified: just check the next rule in that case
+    if (queueName.equals(YarnConfiguration.DEFAULT_QUEUE_NAME)) {
+      return null;
+    }
+    queueName = assureRoot(queueName);
+    // If we can create the queue in the rule or the queue exists return it
+    if (createQueue || configuredQueue(queueName)) {
+      return new ApplicationPlacementContext(queueName);
+    }
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
index a9e823513c8..4ffb7db7f07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.security.Groups;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -47,8 +47,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.ManagedP
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT;
 
 public class UserGroupMappingPlacementRule extends PlacementRule {
-  private static final Log LOG = LogFactory
-      .getLog(UserGroupMappingPlacementRule.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(UserGroupMappingPlacementRule.class);
 
   public static final String CURRENT_USER_MAPPING = "%user";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserPlacementRule.java
new file mode 100644
index 00000000000..d4022fe6dc9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserPlacementRule.java
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.cleanName;
+
+/**
+ * Places apps in queues by username of the submitter.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class UserPlacementRule extends FSPlacementRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(UserPlacementRule.class);
+
+  @Override
+  public ApplicationPlacementContext getPlacementForApp(
+      ApplicationSubmissionContext asc, String user) throws YarnException {
+    String queueName;
+
+    String cleanUser = cleanName(user);
+    PlacementRule parentRule = getParentRule();
+    if (parentRule != null) {
+      LOG.debug("User rule: parent rule found: {}", parentRule.getName());
+      ApplicationPlacementContext parent =
+          parentRule.getPlacementForApp(asc, user);
+      if (parent == null || getQueueManager().
+          getQueue(parent.getQueue()) instanceof FSLeafQueue) {
+        LOG.debug("User rule: parent rule failed");
+        return null;
+      }
+      LOG.debug("User rule: parent rule result: {}", parent.getQueue());
+      queueName = parent.getQueue() + DOT + cleanUser;
+    } else {
+      queueName = assureRoot(cleanUser);
+    }
+
+    // If we can create the queue in the rule or the queue exists return it
+    if (createQueue || configuredQueue(queueName)) {
+      return new ApplicationPlacementContext(queueName);
+    }
+    return null;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
index ed0486ab4a3..838766573ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
@@ -31,8 +31,8 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -86,7 +86,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 public class FileSystemRMStateStore extends RMStateStore {
 
-  public static final Log LOG = LogFactory.getLog(FileSystemRMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(FileSystemRMStateStore.class);
 
   protected static final String ROOT_DIR_NAME = "FSRMStateRoot";
   protected static final Version CURRENT_VERSION_INFO = Version
@@ -818,7 +819,7 @@ public class FileSystemRMStateStore extends RMStateStore {
       fsIn.readFully(data);
       return data;
     } finally {
-      IOUtils.cleanup(LOG, fsIn);
+      IOUtils.cleanupWithLogger(LOG, fsIn);
     }
   }
 
@@ -852,7 +853,7 @@ public class FileSystemRMStateStore extends RMStateStore {
       fsOut = null;
       fs.rename(tempPath, outputPath);
     } finally {
-      IOUtils.cleanup(LOG, fsOut);
+      IOUtils.cleanupWithLogger(LOG, fsOut);
     }
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/LeveldbRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/LeveldbRMStateStore.java
index 0a911615f8e..6ac19bc523a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/LeveldbRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/LeveldbRMStateStore.java
@@ -34,8 +34,8 @@ import java.util.Map.Entry;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -80,8 +80,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 public class LeveldbRMStateStore extends RMStateStore {
 
-  public static final Log LOG =
-      LogFactory.getLog(LeveldbRMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(LeveldbRMStateStore.class);
 
   private static final String SEPARATOR = "/";
   private static final String DB_NAME = "yarn-rm-state";
@@ -377,7 +377,7 @@ public class LeveldbRMStateStore extends RMStateStore {
     try {
       key.readFields(in);
     } finally {
-      IOUtils.cleanup(LOG, in);
+      IOUtils.cleanupWithLogger(LOG, in);
     }
     return key;
   }
@@ -423,7 +423,7 @@ public class LeveldbRMStateStore extends RMStateStore {
     try {
       tokenData = RMStateStoreUtils.readRMDelegationTokenIdentifierData(in);
     } finally {
-      IOUtils.cleanup(LOG, in);
+      IOUtils.cleanupWithLogger(LOG, in);
     }
     return tokenData;
   }
@@ -441,7 +441,7 @@ public class LeveldbRMStateStore extends RMStateStore {
       try {
         state.rmSecretManagerState.dtSequenceNumber = in.readInt();
       } finally {
-        IOUtils.cleanup(LOG, in);
+        IOUtils.cleanupWithLogger(LOG, in);
       }
     }
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
index deb79a573d6..98fca0fbd39 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
@@ -42,8 +42,8 @@ import javax.crypto.SecretKey;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.SettableFuture;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -121,7 +121,8 @@ public abstract class RMStateStore extends AbstractService {
   private final ReadLock readLock;
   private final WriteLock writeLock;
 
-  public static final Log LOG = LogFactory.getLog(RMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(RMStateStore.class);
 
   /**
    * The enum defines state of RMStateStore.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreFactory.java
index c09ddb8aa1d..b9f68b6032b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreFactory.java
@@ -17,14 +17,15 @@
 */
 package org.apache.hadoop.yarn.server.resourcemanager.recovery;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 
 public class RMStateStoreFactory {
-  private static final Log LOG = LogFactory.getLog(RMStateStoreFactory.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMStateStoreFactory.class);
   
   public static RMStateStore getStore(Configuration conf) {
     Class<? extends RMStateStore> storeClass =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreUtils.java
index 9aef794041a..7bf23cf8be4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreUtils.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.recovery;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
@@ -37,7 +37,8 @@ import java.io.IOException;
 @Unstable
 public class RMStateStoreUtils {
 
-  public static final Log LOG = LogFactory.getLog(RMStateStoreUtils.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(RMStateStoreUtils.class);
 
   /**
    * Returns the RM Delegation Token data from the {@link DataInputStream} as a
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index bcdbcfd4cf2..16b6bdc7e84 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.recovery;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -178,7 +178,8 @@ import java.util.Set;
 @Private
 @Unstable
 public class ZKRMStateStore extends RMStateStore {
-  private static final Log LOG = LogFactory.getLog(ZKRMStateStore.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ZKRMStateStore.class);
 
   private static final String RM_DELEGATION_TOKENS_ROOT_ZNODE_NAME =
       "RMDelegationTokensRoot";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
index ed71ea2f016..9c5157b704e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/records/impl/pb/ApplicationAttemptStateDataPBImpl.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.io.DataInputByteBuffer;
 import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.IOUtils;
@@ -45,8 +45,8 @@ import com.google.protobuf.TextFormat;
 
 public class ApplicationAttemptStateDataPBImpl extends
     ApplicationAttemptStateData {
-  private static Log LOG =
-      LogFactory.getLog(ApplicationAttemptStateDataPBImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ApplicationAttemptStateDataPBImpl.class);
   ApplicationAttemptStateDataProto proto = 
       ApplicationAttemptStateDataProto.getDefaultInstance();
   ApplicationAttemptStateDataProto.Builder builder = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/SimpleCapacityReplanner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/SimpleCapacityReplanner.java
index 7bfc730eb9d..1c248e11a05 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/SimpleCapacityReplanner.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/SimpleCapacityReplanner.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ReservationDefinition;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.reservation.Plan;
@@ -48,8 +48,8 @@ import com.google.common.annotations.VisibleForTesting;
  */
 public class SimpleCapacityReplanner implements Planner {
 
-  private static final Log LOG = LogFactory
-      .getLog(SimpleCapacityReplanner.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(SimpleCapacityReplanner.class);
 
   private static final Resource ZERO_RESOURCE = Resource.newInstance(0, 0);
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java
index 65491026a94..b6eeb4cddd3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/DynamicResourceConfiguration.java
@@ -23,8 +23,8 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.StringUtils;
@@ -37,8 +37,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 
 public class DynamicResourceConfiguration extends Configuration {
 
-  private static final Log LOG =
-    LogFactory.getLog(DynamicResourceConfiguration.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DynamicResourceConfiguration.class);
 
   @Private
   public static final String PREFIX = "yarn.resource.dynamic.";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java
index e980069d487..49f7d0876b6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/resource/ResourceProfilesManagerImpl.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.resource;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceInformation;
@@ -47,8 +47,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public class ResourceProfilesManagerImpl implements ResourceProfilesManager {
 
-  private static final Log LOG =
-      LogFactory.getLog(ResourceProfilesManagerImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ResourceProfilesManagerImpl.class);
 
   private final Map<String, Resource> profiles = new ConcurrentHashMap<>();
   private Configuration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
index 696b39d001d..9a16b770f39 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
@@ -37,8 +37,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ipc.CallerContext;
@@ -120,7 +120,8 @@ import com.google.common.annotations.VisibleForTesting;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class RMAppImpl implements RMApp, Recoverable {
 
-  private static final Log LOG = LogFactory.getLog(RMAppImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAppImpl.class);
   private static final String UNAVAILABLE = "N/A";
   private static final String UNLIMITED = "UNLIMITED";
   private static final long UNKNOWN = -1L;
@@ -1775,8 +1776,8 @@ public class RMAppImpl implements RMApp, Recoverable {
 
   @Override
   public Map<NodeId, LogAggregationReport> getLogAggregationReportsForApp() {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       if (!isLogAggregationFinished() && isAppInFinalState(this) &&
           systemClock.getTime() > this.logAggregationStartTime
           + this.logAggregationStatusTimeout) {
@@ -1800,8 +1801,8 @@ public class RMAppImpl implements RMApp, Recoverable {
   }
 
   public void aggregateLogReport(NodeId nodeId, LogAggregationReport report) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       if (this.logAggregationEnabled && !isLogAggregationFinished()) {
         LogAggregationReport curReport = this.logAggregationStatus.get(nodeId);
         boolean stateChangedToFinal = false;
@@ -1850,8 +1851,8 @@ public class RMAppImpl implements RMApp, Recoverable {
 
   @Override
   public LogAggregationStatus getLogAggregationStatusForAppReport() {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       if (! logAggregationEnabled) {
         return LogAggregationStatus.DISABLED;
       }
@@ -2021,8 +2022,8 @@ public class RMAppImpl implements RMApp, Recoverable {
   }
 
   public String getLogAggregationFailureMessagesForNM(NodeId nodeId) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       List<String> failureMessages =
           this.logAggregationFailureMessagesForNMs.get(nodeId);
       if (failureMessages == null || failureMessages.isEmpty()) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index 7b04ae7e72c..e951bb06d88 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
@@ -36,8 +36,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import javax.crypto.SecretKey;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
@@ -127,7 +127,8 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
   private static final String DIAGNOSTIC_LIMIT_CONFIG_ERROR_MESSAGE =
       "The value of %s should be a positive integer: %s";
 
-  private static final Log LOG = LogFactory.getLog(RMAppAttemptImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAppAttemptImpl.class);
 
   private static final RecordFactory recordFactory = RecordFactoryProvider
       .getRecordFactory(null);
@@ -1372,7 +1373,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
       setTrackingUrlToRMAppPage(stateToBeStored);
     }
     String finalTrackingUrl = getOriginalTrackingUrl();
-    FinalApplicationStatus status = null;
+    FinalApplicationStatus finalStatus = null;
     int exitStatus = ContainerExitStatus.INVALID;
     switch (event.getType()) {
     case LAUNCH_FAILED:
@@ -1387,7 +1388,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
       diags.append(unregisterEvent.getDiagnosticMsg());
       // reset finalTrackingUrl to url sent by am
       finalTrackingUrl = sanitizeTrackingUrl(unregisterEvent.getFinalTrackingUrl());
-      status = unregisterEvent.getFinalApplicationStatus();
+      finalStatus = unregisterEvent.getFinalApplicationStatus();
       break;
     case CONTAINER_FINISHED:
       RMAppAttemptContainerFinishedEvent finishEvent =
@@ -1396,10 +1397,8 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
       exitStatus = finishEvent.getContainerStatus().getExitStatus();
       break;
     case KILL:
-      status = FinalApplicationStatus.KILLED;
       break;
     case FAIL:
-      status = FinalApplicationStatus.FAILED;
       diags.append(event.getDiagnosticMsg());
       break;
     case EXPIRE:
@@ -1416,14 +1415,13 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
     ApplicationAttemptStateData attemptState = ApplicationAttemptStateData
         .newInstance(applicationAttemptId, getMasterContainer(),
             rmStore.getCredentialsFromAppAttempt(this), startTime,
-            stateToBeStored, finalTrackingUrl, diags.toString(), status,
-            exitStatus, getFinishTime(), resUsage.getResourceUsageSecondsMap(),
+            stateToBeStored, finalTrackingUrl, diags.toString(), finalStatus, exitStatus,
+            getFinishTime(), resUsage.getResourceUsageSecondsMap(),
             this.attemptMetrics.getPreemptedResourceSecondsMap());
     LOG.info("Updating application attempt " + applicationAttemptId
         + " with final state: " + targetedFinalState + ", and exit status: "
         + exitStatus);
     rmStore.updateApplicationAttemptState(attemptState);
-    finalStatus = status;
   }
 
   private static class FinalSavingTransition extends BaseTransition {
@@ -1589,8 +1587,8 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
         && this.getFinishTime() < (end - attemptFailuresValidityInterval)) {
         return false;
     }
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       int exitStatus = getAMContainerExitStatus();
       return !(exitStatus == ContainerExitStatus.PREEMPTED
           || exitStatus == ContainerExitStatus.ABORTED
@@ -1919,6 +1917,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
         (RMAppAttemptUnregistrationEvent) event;
     this.diagnostics.append(unregisterEvent.getDiagnosticMsg());
     originalTrackingUrl = sanitizeTrackingUrl(unregisterEvent.getFinalTrackingUrl());
+    finalStatus = unregisterEvent.getFinalApplicationStatus();
   }
 
   private static final class ContainerFinishedTransition
@@ -2275,8 +2274,8 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
 
   @Override
   public long getFinishTime() {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       return this.finishTime;
     } finally {
       this.readLock.unlock();
@@ -2284,8 +2283,8 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
   }
 
   private void setFinishTime(long finishTime) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       this.finishTime = finishTime;
     } finally {
       this.writeLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java
index 43e6e4d577c..77c2d64d54b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java
@@ -29,8 +29,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.commons.lang3.time.DateUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -42,7 +42,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
 public class RMAppAttemptMetrics {
-  private static final Log LOG = LogFactory.getLog(RMAppAttemptMetrics.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAppAttemptMetrics.class);
 
   private ApplicationAttemptId attemptId = null;
   // preemption info
@@ -72,8 +73,8 @@ public class RMAppAttemptMetrics {
   }
 
   public void updatePreemptionInfo(Resource resource, RMContainer container) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       resourcePreempted = Resources.addTo(resourcePreempted, resource);
     } finally {
       writeLock.unlock();
@@ -96,8 +97,8 @@ public class RMAppAttemptMetrics {
   }
   
   public Resource getResourcePreempted() {
+    readLock.lock();
     try {
-      readLock.lock();
       return Resource.newInstance(resourcePreempted);
     } finally {
       readLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
index 2fd946fe9a1..3b0e9a8cb61 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
@@ -42,7 +42,8 @@ import org.apache.hadoop.yarn.util.SystemClock;
 public class RMAppLifetimeMonitor
     extends AbstractLivelinessMonitor<RMAppToMonitor> {
 
-  private static final Log LOG = LogFactory.getLog(RMAppLifetimeMonitor.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMAppLifetimeMonitor.class);
 
   private RMContext rmContext;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java
index ad30447935d..a251dcdef42 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java
@@ -28,8 +28,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
@@ -68,7 +68,8 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class RMContainerImpl implements RMContainer {
 
-  private static final Log LOG = LogFactory.getLog(RMContainerImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMContainerImpl.class);
 
   private static final StateMachineFactory<RMContainerImpl, RMContainerState, 
                                            RMContainerEventType, RMContainerEvent> 
@@ -306,8 +307,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public Resource getAllocatedResource() {
+    readLock.lock();
     try {
-      readLock.lock();
       return container.getResource();
     } finally {
       readLock.unlock();
@@ -316,8 +317,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public Resource getLastConfirmedResource() {
+    readLock.lock();
     try {
-      readLock.lock();
       return this.lastConfirmedResource;
     } finally {
       readLock.unlock();
@@ -346,8 +347,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public long getFinishTime() {
+    readLock.lock();
     try {
-      readLock.lock();
       return finishTime;
     } finally {
       readLock.unlock();
@@ -356,8 +357,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public String getDiagnosticsInfo() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (finishedStatus != null) {
         return finishedStatus.getDiagnostics();
       } else {
@@ -370,8 +371,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public String getLogURL() {
+    readLock.lock();
     try {
-      readLock.lock();
       StringBuilder logURL = new StringBuilder();
       logURL.append(WebAppUtils.getHttpSchemePrefix(rmContext
           .getYarnConfiguration()));
@@ -386,8 +387,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public int getContainerExitStatus() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (finishedStatus != null) {
         return finishedStatus.getExitStatus();
       } else {
@@ -400,8 +401,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public ContainerState getContainerState() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (finishedStatus != null) {
         return finishedStatus.getState();
       } else {
@@ -414,8 +415,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public ContainerRequest getContainerRequest() {
+    readLock.lock();
     try {
-      readLock.lock();
       return containerRequestForRecovery;
     } finally {
       readLock.unlock();
@@ -438,8 +439,8 @@ public class RMContainerImpl implements RMContainer {
   
   @Override
   public boolean isAMContainer() {
+    readLock.lock();
     try {
-      readLock.lock();
       return isAMContainer;
     } finally {
       readLock.unlock();
@@ -447,8 +448,8 @@ public class RMContainerImpl implements RMContainer {
   }
 
   public void setAMContainer(boolean isAMContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.isAMContainer = isAMContainer;
     } finally {
       writeLock.unlock();
@@ -470,8 +471,9 @@ public class RMContainerImpl implements RMContainer {
       LOG.debug("Processing " + event.getContainerId() + " of type " + event
               .getType());
     }
+
+    writeLock.lock();
     try {
-      writeLock.lock();
       RMContainerState oldState = getState();
       try {
          stateMachine.doTransition(event.getType(), event);
@@ -809,8 +811,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public String getNodeHttpAddress() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (container.getNodeHttpAddress() != null) {
         StringBuilder httpAddress = new StringBuilder();
         httpAddress.append(WebAppUtils.getHttpSchemePrefix(rmContext
@@ -893,8 +895,8 @@ public class RMContainerImpl implements RMContainer {
 
   @Override
   public Resource getAllocatedOrReservedResource() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (getState().equals(RMContainerState.RESERVED)) {
         return getReservedResource();
       } else {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
index d33ee44de4d..963b86d986c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
@@ -36,8 +36,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.net.Node;
@@ -104,7 +104,8 @@ import com.google.common.annotations.VisibleForTesting;
 @SuppressWarnings("unchecked")
 public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
 
-  private static final Log LOG = LogFactory.getLog(RMNodeImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMNodeImpl.class);
 
   private static final RecordFactory recordFactory = RecordFactoryProvider
       .getRecordFactory(null);
@@ -669,8 +670,8 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
 
   public void handle(RMNodeEvent event) {
     LOG.debug("Processing " + event.getNodeId() + " of type " + event.getType());
+    writeLock.lock();
     try {
-      writeLock.lock();
       NodeState oldState = getState();
       try {
          stateMachine.doTransition(event.getType(), event);
@@ -1514,9 +1515,8 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
 
   @Override
   public List<Container> pullNewlyIncreasedContainers() {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       if (nmReportedIncreasedContainers.isEmpty()) {
         return Collections.emptyList();
       } else {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractResourceUsage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractResourceUsage.java
index 664cb3505a2..ad3bfb18ef3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractResourceUsage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractResourceUsage.java
@@ -118,8 +118,8 @@ public class AbstractResourceUsage {
       return normalize(noLabelUsages.resArr.get(type.idx));
     }
 
+    readLock.lock();
     try {
-      readLock.lock();
       UsageByLabel usage = usages.get(label);
       if (null == usage) {
         return Resources.none();
@@ -131,8 +131,8 @@ public class AbstractResourceUsage {
   }
 
   protected Resource _getAll(ResourceType type) {
+    readLock.lock();
     try {
-      readLock.lock();
       Resource allOfType = Resources.createResource(0);
       for (Map.Entry<String, UsageByLabel> usageEntry : usages.entrySet()) {
         // all usages types are initialized
@@ -159,8 +159,8 @@ public class AbstractResourceUsage {
   }
 
   protected void _set(String label, ResourceType type, Resource res) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       UsageByLabel usage = getAndAddIfMissing(label);
       usage.resArr.set(type.idx, res);
     } finally {
@@ -169,8 +169,8 @@ public class AbstractResourceUsage {
   }
 
   protected void _inc(String label, ResourceType type, Resource res) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       UsageByLabel usage = getAndAddIfMissing(label);
       usage.resArr.set(type.idx,
           Resources.add(usage.resArr.get(type.idx), res));
@@ -180,8 +180,8 @@ public class AbstractResourceUsage {
   }
 
   protected void _dec(String label, ResourceType type, Resource res) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       UsageByLabel usage = getAndAddIfMissing(label);
       usage.resArr.set(type.idx,
           Resources.subtract(usage.resArr.get(type.idx), res));
@@ -192,8 +192,8 @@ public class AbstractResourceUsage {
 
   @Override
   public String toString() {
+    readLock.lock();
     try {
-      readLock.lock();
       return usages.toString();
     } finally {
       readLock.unlock();
@@ -201,8 +201,8 @@ public class AbstractResourceUsage {
   }
 
   public Set<String> getNodePartitionsSet() {
+    readLock.lock();
     try {
-      readLock.lock();
       return usages.keySet();
     } finally {
       readLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index a798b97af5f..7e22fd5a6cc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -34,8 +34,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -92,9 +92,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmnode.UpdatedContainerInfo
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivitiesManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.ContainerRequest;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.QueueEntitlement;
-
-
-
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ReleaseContainerEvent;
 import org.apache.hadoop.yarn.server.scheduler.OpportunisticContainerContext;
 import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
@@ -116,7 +113,8 @@ public abstract class AbstractYarnScheduler
     <T extends SchedulerApplicationAttempt, N extends SchedulerNode>
     extends AbstractService implements ResourceScheduler {
 
-  private static final Log LOG = LogFactory.getLog(AbstractYarnScheduler.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractYarnScheduler.class);
 
   protected final ClusterNodeTracker<N> nodeTracker =
       new ClusterNodeTracker<>();
@@ -345,8 +343,8 @@ public abstract class AbstractYarnScheduler
 
   protected void containerLaunchedOnNode(
       ContainerId containerId, SchedulerNode node) {
+    readLock.lock();
     try {
-      readLock.lock();
       // Get the application for the finished container
       SchedulerApplicationAttempt application =
           getCurrentAttemptForContainer(containerId);
@@ -487,8 +485,8 @@ public abstract class AbstractYarnScheduler
 
   public void recoverContainersOnNode(List<NMContainerStatus> containerReports,
       RMNode nm) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!rmContext.isWorkPreservingRecoveryEnabled()
           || containerReports == null || (containerReports != null
           && containerReports.isEmpty())) {
@@ -769,13 +767,13 @@ public abstract class AbstractYarnScheduler
   @Override
   public void moveAllApps(String sourceQueue, String destQueue)
       throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // check if destination queue is a valid leaf queue
       try {
         getQueueInfo(destQueue, false, false);
       } catch (IOException e) {
-        LOG.warn(e);
+        LOG.warn(e.toString());
         throw new YarnException(e);
       }
       // check if source queue is a valid
@@ -800,8 +798,8 @@ public abstract class AbstractYarnScheduler
   @Override
   public void killAllAppsInQueue(String queueName)
       throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // check if queue is a valid
       List<ApplicationAttemptId> apps = getAppsInQueue(queueName);
       if (apps == null) {
@@ -826,8 +824,8 @@ public abstract class AbstractYarnScheduler
    */
   public void updateNodeResource(RMNode nm,
       ResourceOption resourceOption) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       SchedulerNode node = getSchedulerNode(nm.getNodeID());
       Resource newResource = resourceOption.getResource();
       Resource oldResource = node.getTotalResource();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java
index 049f324793d..15df0517c8c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ActiveUsersManager.java
@@ -22,8 +22,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.server.utils.Lock;
@@ -38,7 +38,8 @@ import org.apache.hadoop.yarn.server.utils.Lock;
 @Private
 public class ActiveUsersManager implements AbstractUsersManager {
 
-  private static final Log LOG = LogFactory.getLog(ActiveUsersManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ActiveUsersManager.class);
   
   private final QueueMetrics metrics;
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index ca7d9ce712e..bd6e7ca24e3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -31,8 +31,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -63,7 +63,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 @Unstable
 public class AppSchedulingInfo {
   
-  private static final Log LOG = LogFactory.getLog(AppSchedulingInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AppSchedulingInfo.class);
 
   private final ApplicationId applicationId;
   private final ApplicationAttemptId applicationAttemptId;
@@ -134,8 +135,8 @@ public class AppSchedulingInfo {
   }
 
   public String getQueueName() {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       return queue.getQueueName();
     } finally {
       this.readLock.unlock();
@@ -464,8 +465,8 @@ public class AppSchedulingInfo {
    */
   public List<ResourceRequest> getAllResourceRequests() {
     List<ResourceRequest> ret = new ArrayList<>();
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       for (AppPlacementAllocator ap : schedulerKeyToAppPlacementAllocator
           .values()) {
         ret.addAll(ap.getResourceRequests().values());
@@ -482,8 +483,8 @@ public class AppSchedulingInfo {
    */
   public List<SchedulingRequest> getAllSchedulingRequests() {
     List<SchedulingRequest> ret = new ArrayList<>();
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       schedulerKeyToAppPlacementAllocator.values().stream()
           .filter(ap -> ap.getSchedulingRequest() != null)
           .forEach(ap -> ret.add(ap.getSchedulingRequest()));
@@ -494,8 +495,8 @@ public class AppSchedulingInfo {
   }
 
   public PendingAsk getNextPendingAsk() {
+    readLock.lock();
     try {
-      readLock.lock();
       SchedulerRequestKey firstRequestKey = schedulerKeys.first();
       return getPendingAsk(firstRequestKey, ResourceRequest.ANY);
     } finally {
@@ -510,8 +511,8 @@ public class AppSchedulingInfo {
 
   public PendingAsk getPendingAsk(SchedulerRequestKey schedulerKey,
       String resourceName) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       AppPlacementAllocator ap = schedulerKeyToAppPlacementAllocator.get(
           schedulerKey);
       return (ap == null) ? PendingAsk.ZERO : ap.getPendingAsk(resourceName);
@@ -546,9 +547,8 @@ public class AppSchedulingInfo {
   public ContainerRequest allocate(NodeType type,
       SchedulerNode node, SchedulerRequestKey schedulerKey,
       Container containerAllocated) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       if (null != containerAllocated) {
         updateMetricsForAllocatedContainer(type, node, containerAllocated);
       }
@@ -567,8 +567,8 @@ public class AppSchedulingInfo {
   }
   
   public void move(Queue newQueue) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       QueueMetrics oldMetrics = queue.getMetrics();
       QueueMetrics newMetrics = newQueue.getMetrics();
       for (AppPlacementAllocator ap : schedulerKeyToAppPlacementAllocator
@@ -606,8 +606,8 @@ public class AppSchedulingInfo {
 
   public void stop() {
     // clear pending resources metrics for the application
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       QueueMetrics metrics = queue.getMetrics();
       for (AppPlacementAllocator ap : schedulerKeyToAppPlacementAllocator
           .values()) {
@@ -633,8 +633,8 @@ public class AppSchedulingInfo {
   }
 
   public void setQueue(Queue queue) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       this.queue = queue;
     } finally {
       this.writeLock.unlock();
@@ -662,8 +662,8 @@ public class AppSchedulingInfo {
     if (rmContainer.getExecutionType() != ExecutionType.GUARANTEED) {
       return;
     }
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       QueueMetrics metrics = queue.getMetrics();
       if (pending) {
         // If there was any container to recover, the application was
@@ -690,8 +690,8 @@ public class AppSchedulingInfo {
    */
   public boolean checkAllocation(NodeType type, SchedulerNode node,
       SchedulerRequestKey schedulerKey) {
+    readLock.lock();
     try {
-      readLock.lock();
       AppPlacementAllocator ap = schedulerKeyToAppPlacementAllocator.get(
           schedulerKey);
       if (null == ap) {
@@ -751,8 +751,8 @@ public class AppSchedulingInfo {
    */
   public boolean canDelayTo(
       SchedulerRequestKey schedulerKey, String resourceName) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       AppPlacementAllocator ap =
           schedulerKeyToAppPlacementAllocator.get(schedulerKey);
       return (ap == null) || ap.canDelayTo(resourceName);
@@ -772,8 +772,8 @@ public class AppSchedulingInfo {
    */
   public boolean precheckNode(SchedulerRequestKey schedulerKey,
       SchedulerNode schedulerNode, SchedulingMode schedulingMode) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       AppPlacementAllocator ap =
           schedulerKeyToAppPlacementAllocator.get(schedulerKey);
       return (ap != null) && ap.precheckNode(schedulerNode,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ClusterNodeTracker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ClusterNodeTracker.java
index 7e12aae5bed..f4491df7bf1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ClusterNodeTracker.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ClusterNodeTracker.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -50,7 +50,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 @InterfaceAudience.Private
 public class ClusterNodeTracker<N extends SchedulerNode> {
-  private static final Log LOG = LogFactory.getLog(ClusterNodeTracker.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ClusterNodeTracker.class);
 
   private ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true);
   private Lock readLock = readWriteLock.readLock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ConfigurationMutationACLPolicyFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ConfigurationMutationACLPolicyFactory.java
index 28987857c0b..96c1920b617 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ConfigurationMutationACLPolicyFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ConfigurationMutationACLPolicyFactory.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  */
 public final class ConfigurationMutationACLPolicyFactory {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       ConfigurationMutationACLPolicyFactory.class);
 
   private ConfigurationMutationACLPolicyFactory() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
index 761817e455f..0127e1ecaae 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.QueueState;
@@ -38,7 +38,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSche
 public class QueueStateManager<T extends SchedulerQueue,
     E extends ReservationSchedulerConfiguration> {
 
-  private static final Log LOG = LogFactory.getLog(QueueStateManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(QueueStateManager.class);
 
   private SchedulerQueueManager<T, E> queueManager;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
index 37958de5291..c46c9112ea8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
@@ -73,8 +73,8 @@ public class ResourceUsage extends AbstractResourceUsage {
   }
   
   public void copyAllUsed(AbstractResourceUsage other) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       for (Entry<String, UsageByLabel> entry : other.usages.entrySet()) {
         setUsed(entry.getKey(), Resources.clone(entry.getValue().getUsed()));
       }
@@ -285,8 +285,8 @@ public class ResourceUsage extends AbstractResourceUsage {
   }
 
   public Resource getCachedDemand(String label) {
+    readLock.lock();
     try {
-      readLock.lock();
       Resource demand = Resources.createResource(0);
       Resources.addTo(demand, getCachedUsed(label));
       Resources.addTo(demand, getCachedPending(label));
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppUtils.java
index 631da6790c9..efa410c5356 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerAppUtils.java
@@ -18,12 +18,13 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 public class SchedulerAppUtils {
 
   public static boolean isPlaceBlacklisted(
-      SchedulerApplicationAttempt application, SchedulerNode node, Log log) {
+      SchedulerApplicationAttempt application, SchedulerNode node,
+      Logger log) {
     if (application.isPlaceBlacklisted(node.getNodeName())) {
       if (log.isDebugEnabled()) {
         log.debug("Skipping 'host' " + node.getNodeName() +
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
index 0439a3f8550..2e8a7c14ebe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
@@ -36,8 +36,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Stable;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -100,8 +100,8 @@ import com.google.common.collect.ConcurrentHashMultiset;
 @Unstable
 public class SchedulerApplicationAttempt implements SchedulableEntity {
   
-  private static final Log LOG = LogFactory
-    .getLog(SchedulerApplicationAttempt.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(SchedulerApplicationAttempt.class);
 
   private FastDateFormat fdf =
       FastDateFormat.getInstance("EEE MMM dd HH:mm:ss Z yyyy");
@@ -253,8 +253,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
    * @return live containers of the application
    */
   public Collection<RMContainer> getLiveContainers() {
+    readLock.lock();
     try {
-      readLock.lock();
       return new ArrayList<>(liveContainers.values());
     } finally {
       readLock.unlock();
@@ -307,8 +307,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public PendingAsk getPendingAsk(
       SchedulerRequestKey schedulerKey, String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       return appSchedulingInfo.getPendingAsk(schedulerKey, resourceName);
     } finally {
       readLock.unlock();
@@ -321,8 +321,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public int getOutstandingAsksCount(SchedulerRequestKey schedulerKey,
       String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       AppPlacementAllocator ap = appSchedulingInfo.getAppPlacementAllocator(
           schedulerKey);
       return ap == null ? 0 : ap.getOutstandingAsksCount(resourceName);
@@ -369,8 +369,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public void addRMContainer(
       ContainerId id, RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!getApplicationAttemptId().equals(
           rmContainer.getApplicationAttemptId()) &&
           !liveContainers.containsKey(id)) {
@@ -393,8 +393,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
 
   public void removeRMContainer(ContainerId containerId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       RMContainer rmContainer = liveContainers.remove(containerId);
       if (rmContainer != null) {
         if (rmContainer.getExecutionType() == ExecutionType.OPPORTUNISTIC) {
@@ -446,8 +446,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   
   public boolean updateResourceRequests(
       List<ResourceRequest> requests) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!isStopped) {
         return appSchedulingInfo.updateResourceRequests(requests, false);
       }
@@ -463,8 +463,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
       return false;
     }
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!isStopped) {
         return appSchedulingInfo.updateSchedulingRequests(requests, false);
       }
@@ -476,8 +476,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   
   public void recoverResourceRequestsForContainer(
       ContainerRequest containerRequest) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!isStopped) {
         appSchedulingInfo.updateResourceRequests(
             containerRequest.getResourceRequests(), true);
@@ -488,8 +488,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
   
   public void stop(RMAppAttemptState rmAppAttemptFinalState) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Cleanup all scheduling information
       isStopped = true;
       appSchedulingInfo.stop();
@@ -508,8 +508,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
    */
   public List<RMContainer> getReservedContainers() {
     List<RMContainer> list = new ArrayList<>();
+    readLock.lock();
     try {
-      readLock.lock();
       for (Entry<SchedulerRequestKey, Map<NodeId, RMContainer>> e :
           this.reservedContainers.entrySet()) {
         list.addAll(e.getValue().values());
@@ -524,8 +524,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   public boolean reserveIncreasedContainer(SchedulerNode node,
       SchedulerRequestKey schedulerKey, RMContainer rmContainer,
       Resource reservedResource) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (commonReserve(node, schedulerKey, rmContainer, reservedResource)) {
         attemptResourceUsage.incReserved(node.getPartition(), reservedResource);
         // succeeded
@@ -573,8 +573,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   public RMContainer reserve(SchedulerNode node,
       SchedulerRequestKey schedulerKey, RMContainer rmContainer,
       Container container) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Create RMContainer if necessary
       if (rmContainer == null) {
         rmContainer = new RMContainerImpl(container, schedulerKey,
@@ -617,8 +617,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   
   public int getNumReservedContainers(
       SchedulerRequestKey schedulerKey) {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<NodeId, RMContainer> map = this.reservedContainers.get(
           schedulerKey);
       return (map == null) ? 0 : map.size();
@@ -630,8 +630,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   @SuppressWarnings("unchecked")
   public void containerLaunchedOnNode(ContainerId containerId,
       NodeId nodeId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Inform the container
       RMContainer rmContainer = getRMContainer(containerId);
       if (rmContainer == null) {
@@ -650,8 +650,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   
   public void showRequests() {
     if (LOG.isDebugEnabled()) {
+      readLock.lock();
       try {
-        readLock.lock();
         for (SchedulerRequestKey schedulerKey : getSchedulerKeys()) {
           AppPlacementAllocator ap = getAppPlacementAllocator(schedulerKey);
           if (ap != null &&
@@ -762,8 +762,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
    * </code>.
    */
   List<RMContainer> pullContainersToTransfer() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       recoveredPreviousAttemptContainers.clear();
       return new ArrayList<>(liveContainers.values());
     } finally {
@@ -777,8 +777,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
    * <code>AllocateResponse#containersFromPreviousAttempts</code>.
    */
   public List<Container> pullPreviousAttemptContainers() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (recoveredPreviousAttemptContainers.isEmpty()) {
         return null;
       }
@@ -796,8 +796,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   // some reason like DNS unavailable, do not return this container and keep it
   // in the newlyAllocatedContainers waiting to be refetched.
   public List<Container> pullNewlyAllocatedContainers() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       List<Container> returnContainerList = new ArrayList<Container>(
           newlyAllocatedContainers.size());
 
@@ -912,8 +912,9 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
             || ContainerUpdateType.PROMOTE_EXECUTION_TYPE == updateTpe)) {
       return updatedContainers;
     }
+
+    writeLock.lock();
     try {
-      writeLock.lock();
       Iterator<Map.Entry<ContainerId, RMContainer>> i =
           newlyUpdatedContainers.entrySet().iterator();
       while (i.hasNext()) {
@@ -960,8 +961,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
 
   public List<NMToken> pullUpdatedNMTokens() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       List <NMToken> returnList = new ArrayList<>(updatedNMTokens);
       updatedNMTokens.clear();
       return returnList;
@@ -979,8 +980,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public void updateBlacklist(List<String> blacklistAdditions,
       List<String> blacklistRemovals) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!isStopped) {
         if (isWaitingForAMContainer()) {
           // The request is for the AM-container, and the AM-container is
@@ -999,8 +1000,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
 
   public boolean isPlaceBlacklisted(String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       boolean forAMContainer = isWaitingForAMContainer();
       return this.appSchedulingInfo.isPlaceBlacklisted(resourceName,
           forAMContainer);
@@ -1103,8 +1104,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
 
   public ApplicationResourceUsageReport getResourceUsageReport() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       AggregateAppResourceUsage runningResourceUsage =
           getRunningAggregateAppResourceUsage();
       Resource usedResourceClone = Resources.clone(
@@ -1154,8 +1155,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public void transferStateFromPreviousAttempt(
       SchedulerApplicationAttempt appAttempt) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.liveContainers = appAttempt.getLiveContainersMap();
       // this.reReservations = appAttempt.reReservations;
       this.attemptResourceUsage.copyAllUsed(appAttempt.attemptResourceUsage);
@@ -1172,8 +1173,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
   }
   
   public void move(Queue newQueue) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       QueueMetrics oldMetrics = queue.getMetrics();
       QueueMetrics newMetrics = newQueue.getMetrics();
       String newQueueName = newQueue.getQueueName();
@@ -1209,8 +1210,8 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
 
   public void recoverContainer(SchedulerNode node,
       RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // recover app scheduling info
       appSchedulingInfo.recoverContainer(rmContainer, node.getPartition());
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
index b35aeba83b3..e36bc64b191 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java
@@ -26,8 +26,8 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.util.Time;
@@ -58,7 +58,8 @@ import com.google.common.collect.ImmutableSet;
 @Unstable
 public abstract class SchedulerNode {
 
-  private static final Log LOG = LogFactory.getLog(SchedulerNode.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SchedulerNode.class);
 
   private Resource unallocatedResource = Resource.newInstance(0, 0);
   private Resource allocatedResource = Resource.newInstance(0, 0);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
index fe6682c96de..88796db96f7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java
@@ -27,8 +27,8 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -104,7 +104,8 @@ public class SchedulerUtils {
     }
   }
 
-  private static final Log LOG = LogFactory.getLog(SchedulerUtils.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SchedulerUtils.class);
 
   private static final RecordFactory recordFactory =
       RecordFactoryProvider.getRecordFactory(null);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesLogger.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesLogger.java
index 8a3ffce1d8a..9d3080e1adf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesLogger.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesLogger.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.NodeId;
@@ -34,7 +34,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaS
  */
 // FIXME: make sure CandidateNodeSet works with this class
 public class ActivitiesLogger {
-  private static final Log LOG = LogFactory.getLog(ActivitiesLogger.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ActivitiesLogger.class);
 
   /**
    * Methods for recording activities from an app
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesManager.java
index 5d96b17371e..c710ffc3991 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/ActivitiesManager.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
@@ -44,7 +44,8 @@ import java.util.ArrayList;
  * It mainly contains operations for allocation start, add, update and finish.
  */
 public class ActivitiesManager extends AbstractService {
-  private static final Log LOG = LogFactory.getLog(ActivitiesManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ActivitiesManager.class);
   private ConcurrentMap<NodeId, List<NodeAllocation>> recordingNodesAllocation;
   private ConcurrentMap<NodeId, List<NodeAllocation>> completedNodeAllocations;
   private Set<NodeId> activeRecordedNodes;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/AllocationActivity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/AllocationActivity.java
index da768e2430b..ae947b258c5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/AllocationActivity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/AllocationActivity.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * It records an activity operation in allocation,
@@ -34,7 +34,8 @@ public class AllocationActivity {
   private ActivityState state;
   private String diagnostic = null;
 
-  private static final Log LOG = LogFactory.getLog(AllocationActivity.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AllocationActivity.class);
 
   public AllocationActivity(String parentName, String queueName,
       String priority, ActivityState state, String diagnostic, String type) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/NodeAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/NodeAllocation.java
index 691129967ba..7335ed641ba 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/NodeAllocation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/activities/NodeAllocation.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.NodeId;
 
@@ -46,7 +46,8 @@ public class NodeAllocation {
 
   private ActivityNode root = null;
 
-  private static final Log LOG = LogFactory.getLog(NodeAllocation.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeAllocation.class);
 
   public NodeAllocation(NodeId nodeId) {
     this.nodeId = nodeId;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractAutoCreatedLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractAutoCreatedLeafQueue.java
index ac97d722afe..f3511199caa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractAutoCreatedLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractAutoCreatedLeafQueue.java
@@ -77,8 +77,8 @@ public class AbstractAutoCreatedLeafQueue extends LeafQueue {
    */
   public void setEntitlement(String nodeLabel, QueueEntitlement entitlement)
       throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       float capacity = entitlement.getCapacity();
       if (capacity < 0 || capacity > 1.0f) {
         throw new SchedulerDynamicEditException(
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
index caa88cf9d6e..358eaded8ae 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
@@ -29,8 +29,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.security.AccessControlException;
@@ -79,7 +79,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.C
 
 public abstract class AbstractCSQueue implements CSQueue {
 
-  private static final Log LOG = LogFactory.getLog(AbstractCSQueue.class);  
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractCSQueue.class);
   volatile CSQueue parent;
   final String queueName;
   private final String queuePath;
@@ -278,8 +279,8 @@ public abstract class AbstractCSQueue implements CSQueue {
    * @param maximumCapacity new max capacity
    */
   void setMaxCapacity(float maximumCapacity) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       CSQueueUtils.checkMaxCapacity(getQueueName(),
           queueCapacities.getCapacity(), maximumCapacity);
@@ -300,8 +301,8 @@ public abstract class AbstractCSQueue implements CSQueue {
    * @param maximumCapacity new max capacity
    */
   void setMaxCapacity(String nodeLabel, float maximumCapacity) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       CSQueueUtils.checkMaxCapacity(getQueueName(),
           queueCapacities.getCapacity(nodeLabel), maximumCapacity);
@@ -332,8 +333,8 @@ public abstract class AbstractCSQueue implements CSQueue {
       CapacitySchedulerConfiguration configuration) throws
       IOException {
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       // get labels
       this.accessibleLabels =
           configuration.getAccessibleNodeLabels(getQueuePath());
@@ -749,8 +750,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   
   void allocateResource(Resource clusterResource,
       Resource resource, String nodePartition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       queueUsage.incUsed(nodePartition, resource);
 
       ++numContainers;
@@ -764,8 +765,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   
   protected void releaseResource(Resource clusterResource,
       Resource resource, String nodePartition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       queueUsage.decUsed(nodePartition, resource);
 
       CSQueueUtils.updateQueueStatistics(resourceCalculator, clusterResource,
@@ -784,8 +785,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   
   @Private
   public Map<AccessType, AccessControlList> getACLs() {
+    readLock.lock();
     try {
-      readLock.lock();
       return acls;
     } finally {
       readLock.unlock();
@@ -937,8 +938,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   boolean canAssignToThisQueue(Resource clusterResource,
       String nodePartition, ResourceLimits currentResourceLimits,
       Resource resourceCouldBeUnreserved, SchedulingMode schedulingMode) {
+    readLock.lock();
     try {
-      readLock.lock();
       // Get current limited resource:
       // - When doing RESPECT_PARTITION_EXCLUSIVITY allocation, we will respect
       // queues' max capacity.
@@ -1202,9 +1203,8 @@ public abstract class AbstractCSQueue implements CSQueue {
       Resource netAllocated = Resources.subtract(required,
           request.getTotalReleasedResource());
 
+      readLock.lock();
       try {
-        readLock.lock();
-
         String partition = schedulerContainer.getNodePartition();
         Resource maxResourceLimit;
         if (allocation.getSchedulingMode()
@@ -1253,8 +1253,8 @@ public abstract class AbstractCSQueue implements CSQueue {
 
   @Override
   public void activeQueue() throws YarnException {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       if (getState() == QueueState.RUNNING) {
         LOG.info("The specified queue:" + queueName
             + " is already in the RUNNING state.");
@@ -1277,8 +1277,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   }
 
   protected void appFinished() {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       if (getState() == QueueState.DRAINING) {
         if (getNumApplications() == 0) {
           updateQueueState(QueueState.STOPPED);
@@ -1300,8 +1300,8 @@ public abstract class AbstractCSQueue implements CSQueue {
   }
 
   public void recoverDrainingState() {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       if (getState() == QueueState.STOPPED) {
         updateQueueState(QueueState.DRAINING);
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java
index 9d38f791e73..eb3221e957d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractManagedParentQueue.java
@@ -54,9 +54,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
   @Override
   public void reinitialize(CSQueue newlyParsedQueue, Resource clusterResource)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // Set new configs
       setupQueueConfigs(clusterResource);
 
@@ -72,8 +71,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
    */
   public void addChildQueue(CSQueue childQueue)
       throws SchedulerDynamicEditException, IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (childQueue.getCapacity() > 0) {
         throw new SchedulerDynamicEditException(
             "Queue " + childQueue + " being added has non zero capacity.");
@@ -95,8 +94,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
    */
   public void removeChildQueue(CSQueue childQueue)
       throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (childQueue.getCapacity() > 0) {
         throw new SchedulerDynamicEditException(
             "Queue " + childQueue + " being removed has non zero capacity.");
@@ -124,8 +123,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
   public CSQueue removeChildQueue(String childQueueName)
       throws SchedulerDynamicEditException {
     CSQueue childQueue;
+    writeLock.lock();
     try {
-      writeLock.lock();
       childQueue = this.csContext.getCapacitySchedulerQueueManager().getQueue(
           childQueueName);
       if (childQueue != null) {
@@ -141,8 +140,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
   }
 
   protected float sumOfChildCapacities() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       float ret = 0;
       for (CSQueue l : childQueues) {
         ret += l.getCapacity();
@@ -154,8 +153,8 @@ public abstract class AbstractManagedParentQueue extends ParentQueue {
   }
 
   protected float sumOfChildAbsCapacities() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       float ret = 0;
       for (CSQueue l : childQueues) {
         ret += l.getAbsoluteCapacity();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java
index 4489a01b69d..99608d48ddb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AppPriorityACLConfigurationParser.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.util.StringUtils;
@@ -37,8 +37,8 @@ import org.apache.hadoop.yarn.api.records.Priority;
  */
 public class AppPriorityACLConfigurationParser {
 
-  private static final Log LOG = LogFactory
-      .getLog(AppPriorityACLConfigurationParser.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(AppPriorityACLConfigurationParser.class);
 
   public enum AppPriorityACLKeyType {
     USER(1), GROUP(2), MAX_PRIORITY(3), DEFAULT_PRIORITY(4);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AutoCreatedLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AutoCreatedLeafQueue.java
index e12b55e3da1..b194ad804d8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AutoCreatedLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AutoCreatedLeafQueue.java
@@ -49,9 +49,8 @@ public class AutoCreatedLeafQueue extends AbstractAutoCreatedLeafQueue {
   @Override
   public void reinitialize(CSQueue newlyParsedQueue, Resource clusterResource)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       validate(newlyParsedQueue);
 
       ManagedParentQueue managedParentQueue = (ManagedParentQueue) parent;
@@ -72,8 +71,8 @@ public class AutoCreatedLeafQueue extends AbstractAutoCreatedLeafQueue {
   public void reinitializeFromTemplate(AutoCreatedLeafQueueConfig
       leafQueueTemplate) throws SchedulerDynamicEditException, IOException {
 
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       // TODO:
       // reinitialize only capacities for now since 0 capacity updates
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index 8ecc2f0e204..7b9a13cf740 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -35,8 +35,10 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.conf.Configurable;
@@ -174,7 +176,10 @@ public class CapacityScheduler extends
     PreemptableResourceScheduler, CapacitySchedulerContext, Configurable,
     ResourceAllocationCommitter, MutableConfScheduler {
 
-  private static final Log LOG = LogFactory.getLog(CapacityScheduler.class);
+  private static final Marker FATAL =
+      MarkerFactory.getMarker("FATAL");
+  private static final Logger LOG =
+      LoggerFactory.getLogger(CapacityScheduler.class);
 
   private CapacitySchedulerQueueManager queueManager;
 
@@ -317,8 +322,8 @@ public class CapacityScheduler extends
   @VisibleForTesting
   void initScheduler(Configuration configuration) throws
       IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       String confProviderStr = configuration.get(
           YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
           YarnConfiguration.DEFAULT_CONFIGURATION_STORE);
@@ -416,8 +421,8 @@ public class CapacityScheduler extends
   }
 
   private void startSchedulerThreads() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       activitiesManager.start();
       if (scheduleAsynchronously) {
         Preconditions.checkNotNull(asyncSchedulerThreads,
@@ -450,8 +455,8 @@ public class CapacityScheduler extends
 
   @Override
   public void serviceStop() throws Exception {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.activitiesManager.stop();
       if (scheduleAsynchronously && asyncSchedulerThreads != null) {
         for (Thread t : asyncSchedulerThreads) {
@@ -474,8 +479,8 @@ public class CapacityScheduler extends
   @Override
   public void reinitialize(Configuration newConf, RMContext rmContext)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Configuration configuration = new Configuration(newConf);
       CapacitySchedulerConfiguration oldConf = this.conf;
       this.conf = csConfProvider.loadConfiguration(configuration);
@@ -651,16 +656,15 @@ public class CapacityScheduler extends
         try {
           ResourceCommitRequest<FiCaSchedulerApp, FiCaSchedulerNode> request =
               backlogs.take();
-
+          cs.writeLock.lock();
           try {
-            cs.writeLock.lock();
             cs.tryCommit(cs.getClusterResource(), request, true);
           } finally {
             cs.writeLock.unlock();
           }
 
         } catch (InterruptedException e) {
-          LOG.error(e);
+          LOG.error(e.toString());
           Thread.currentThread().interrupt();
         }
       }
@@ -679,8 +683,8 @@ public class CapacityScheduler extends
 
   @VisibleForTesting
   public PlacementRule getUserGroupMappingPlacementRule() throws IOException {
+    readLock.lock();
     try {
-      readLock.lock();
       UserGroupMappingPlacementRule ugRule = new UserGroupMappingPlacementRule();
       ugRule.initialize(this);
       return ugRule;
@@ -690,8 +694,8 @@ public class CapacityScheduler extends
   }
 
   public PlacementRule getAppNameMappingPlacementRule() throws IOException {
+    readLock.lock();
     try {
-      readLock.lock();
       AppNameMappingPlacementRule anRule = new AppNameMappingPlacementRule();
       anRule.initialize(this);
       return anRule;
@@ -791,8 +795,8 @@ public class CapacityScheduler extends
   private void addApplicationOnRecovery(ApplicationId applicationId,
       String queueName, String user,
       Priority priority, ApplicationPlacementContext placementContext) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       //check if the queue needs to be auto-created during recovery
       CSQueue queue = getOrCreateQueueFromPlacementContext(applicationId, user,
            queueName, placementContext, true);
@@ -814,7 +818,7 @@ public class CapacityScheduler extends
               + "supported by the capacity scheduler, please "
               + "restart with all queues configured"
               + " which were present before shutdown/restart.";
-          LOG.fatal(queueErrorMsg);
+          LOG.error(FATAL, queueErrorMsg);
           throw new QueueInvalidException(queueErrorMsg);
         }
       }
@@ -835,7 +839,7 @@ public class CapacityScheduler extends
               + " not presently supported by the capacity scheduler. Please"
               + " restart with leaf queues before shutdown/restart continuing"
               + " as leaf queues.";
-          LOG.fatal(queueErrorMsg);
+          LOG.error(FATAL, queueErrorMsg);
           throw new QueueInvalidException(queueErrorMsg);
         }
       }
@@ -892,7 +896,7 @@ public class CapacityScheduler extends
               String queueErrorMsg =
                   "Queue named " + queueName + " could not be "
                       + "auto-created during application recovery.";
-              LOG.fatal(queueErrorMsg, e);
+              LOG.error(FATAL, queueErrorMsg, e);
               throw new QueueInvalidException(queueErrorMsg);
             }
           } else{
@@ -915,8 +919,8 @@ public class CapacityScheduler extends
   private void addApplication(ApplicationId applicationId, String queueName,
       String user, Priority priority,
       ApplicationPlacementContext placementContext) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (isSystemAppsLimitReached()) {
         String message = "Maximum system application limit reached,"
             + "cannot accept submission of application: " + applicationId;
@@ -1014,8 +1018,8 @@ public class CapacityScheduler extends
       ApplicationAttemptId applicationAttemptId,
       boolean transferStateFromPreviousAttempt,
       boolean isAttemptRecovering) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       SchedulerApplication<FiCaSchedulerApp> application = applications.get(
           applicationAttemptId.getApplicationId());
       if (application == null) {
@@ -1067,8 +1071,8 @@ public class CapacityScheduler extends
 
   private void doneApplication(ApplicationId applicationId,
       RMAppState finalState) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       SchedulerApplication<FiCaSchedulerApp> application = applications.get(
           applicationId);
       if (application == null) {
@@ -1094,8 +1098,8 @@ public class CapacityScheduler extends
   private void doneApplicationAttempt(
       ApplicationAttemptId applicationAttemptId,
       RMAppAttemptState rmAppAttemptFinalState, boolean keepContainers) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       LOG.info("Application Attempt " + applicationAttemptId + " is done."
           + " finalState=" + rmAppAttemptFinalState);
 
@@ -1209,8 +1213,8 @@ public class CapacityScheduler extends
 
     // make sure we aren't stopping/removing the application
     // when the allocate comes in
+    application.getWriteLock().lock();
     try {
-      application.getWriteLock().lock();
       if (application.isStopped()) {
         return EMPTY_ALLOCATION;
       }
@@ -1287,8 +1291,8 @@ public class CapacityScheduler extends
   @Override
   protected void nodeUpdate(RMNode rmNode) {
     long begin = System.nanoTime();
+    readLock.lock();
     try {
-      readLock.lock();
       setLastNodeUpdateTime(Time.now());
       super.nodeUpdate(rmNode);
     } finally {
@@ -1297,8 +1301,8 @@ public class CapacityScheduler extends
 
     // Try to do scheduling
     if (!scheduleAsynchronously) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         ActivitiesLogger.NODE.startNodeUpdateRecording(activitiesManager,
             rmNode.getNodeID());
 
@@ -1324,8 +1328,8 @@ public class CapacityScheduler extends
    */
   private void updateNodeAndQueueResource(RMNode nm,
       ResourceOption resourceOption) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       updateNodeResource(nm, resourceOption);
       Resource clusterResource = getClusterResource();
       getRootQueue().updateClusterResource(clusterResource,
@@ -1912,8 +1916,8 @@ public class CapacityScheduler extends
 
   private void updateNodeAttributes(
       NodeAttributesUpdateSchedulerEvent attributeUpdateEvent) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       for (Entry<String, Set<NodeAttribute>> entry : attributeUpdateEvent
           .getUpdatedNodeToAttributes().entrySet()) {
         String hostname = entry.getKey();
@@ -1939,8 +1943,8 @@ public class CapacityScheduler extends
    */
   private void updateNodeLabelsAndQueueResource(
       NodeLabelsUpdateSchedulerEvent labelUpdateEvent) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Set<String> updateLabels = new HashSet<String>();
       for (Entry<NodeId, Set<String>> entry : labelUpdateEvent
           .getUpdatedNodeToLabels().entrySet()) {
@@ -1977,8 +1981,8 @@ public class CapacityScheduler extends
   }
 
   private void addNode(RMNode nodeManager) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       FiCaSchedulerNode schedulerNode = new FiCaSchedulerNode(nodeManager,
           usePortForNodeName, nodeManager.getNodeLabels());
       nodeTracker.addNode(schedulerNode);
@@ -2014,8 +2018,8 @@ public class CapacityScheduler extends
   }
 
   private void removeNode(RMNode nodeInfo) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // update this node to node label manager
       if (labelManager != null) {
         labelManager.deactivateNode(nodeInfo.getNodeID());
@@ -2159,8 +2163,8 @@ public class CapacityScheduler extends
 
   public void markContainerForKillable(
       RMContainer killableContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (LOG.isDebugEnabled()) {
         LOG.debug(SchedulerEventType.MARK_CONTAINER_FOR_KILLABLE + ": container"
             + killableContainer.toString());
@@ -2195,8 +2199,8 @@ public class CapacityScheduler extends
 
   private void markContainerForNonKillable(
       RMContainer nonKillableContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (LOG.isDebugEnabled()) {
         LOG.debug(
             SchedulerEventType.MARK_CONTAINER_FOR_NONKILLABLE + ": container"
@@ -2264,8 +2268,8 @@ public class CapacityScheduler extends
   private String resolveReservationQueueName(String queueName,
       ApplicationId applicationId, ReservationId reservationID,
       boolean isRecovering) {
+    readLock.lock();
     try {
-      readLock.lock();
       CSQueue queue = getQueue(queueName);
       // Check if the queue is a plan queue
       if ((queue == null) || !(queue instanceof PlanQueue)) {
@@ -2315,8 +2319,8 @@ public class CapacityScheduler extends
   @Override
   public void removeQueue(String queueName)
       throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       LOG.info("Removing queue: " + queueName);
       CSQueue q = this.getQueue(queueName);
       if (!(AbstractAutoCreatedLeafQueue.class.isAssignableFrom(
@@ -2349,8 +2353,8 @@ public class CapacityScheduler extends
   @Override
   public void addQueue(Queue queue)
       throws SchedulerDynamicEditException, IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (queue == null) {
         throw new SchedulerDynamicEditException(
             "Queue specified is null. Should be an implementation of "
@@ -2387,8 +2391,8 @@ public class CapacityScheduler extends
   @Override
   public void setEntitlement(String inQueue, QueueEntitlement entitlement)
       throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       LeafQueue queue = this.queueManager.getAndCheckLeafQueue(inQueue);
       AbstractManagedParentQueue parent =
           (AbstractManagedParentQueue) queue.getParent();
@@ -2424,8 +2428,8 @@ public class CapacityScheduler extends
   @Override
   public String moveApplication(ApplicationId appId,
       String targetQueueName) throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       SchedulerApplication<FiCaSchedulerApp> application =
           applications.get(appId);
       if (application == null) {
@@ -2476,8 +2480,8 @@ public class CapacityScheduler extends
   @Override
   public void preValidateMoveApplication(ApplicationId appId,
       String newQueue) throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       SchedulerApplication<FiCaSchedulerApp> application =
           applications.get(appId);
       if (application == null) {
@@ -2599,8 +2603,8 @@ public class CapacityScheduler extends
   public Priority checkAndGetApplicationPriority(
       Priority priorityRequestedByApp, UserGroupInformation user,
       String queueName, ApplicationId applicationId) throws YarnException {
+    readLock.lock();
     try {
-      readLock.lock();
       Priority appPriority = priorityRequestedByApp;
 
       // Verify the scenario where priority is null from submissionContext.
@@ -2655,8 +2659,8 @@ public class CapacityScheduler extends
       ApplicationId applicationId, SettableFuture<Object> future,
       UserGroupInformation user)
       throws YarnException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Priority appPriority = null;
       SchedulerApplication<FiCaSchedulerApp> application = applications
           .get(applicationId);
@@ -3060,9 +3064,8 @@ public class CapacityScheduler extends
    */
   public boolean moveReservedContainer(RMContainer toBeMovedContainer,
       FiCaSchedulerNode targetNode) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       if (LOG.isDebugEnabled()) {
         LOG.debug("Trying to move container=" + toBeMovedContainer + " to node="
             + targetNode.getNodeID());
@@ -3116,8 +3119,8 @@ public class CapacityScheduler extends
   @Override
   public long checkAndGetApplicationLifetime(String queueName,
       long lifetimeRequestedByApp) {
+    readLock.lock();
     try {
-      readLock.lock();
       CSQueue queue = getQueue(queueName);
       if (queue == null || !(queue instanceof LeafQueue)) {
         return lifetimeRequestedByApp;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
index ead1f575e1e..589a9ce509e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.authorize.AccessControlList;
@@ -74,8 +74,8 @@ import java.util.StringTokenizer;
 
 public class CapacitySchedulerConfiguration extends ReservationSchedulerConfiguration {
 
-  private static final Log LOG = 
-    LogFactory.getLog(CapacitySchedulerConfiguration.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(CapacitySchedulerConfiguration.class);
 
   private static final String CS_CONFIGURATION_FILE = "capacity-scheduler.xml";
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
index 30ecd400dc9..cdde25d23e6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerQueueManager.java
@@ -28,8 +28,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -63,7 +63,7 @@ import com.google.common.annotations.VisibleForTesting;
 public class CapacitySchedulerQueueManager implements SchedulerQueueManager<
     CSQueue, CapacitySchedulerConfiguration>{
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       CapacitySchedulerQueueManager.class);
 
   static final Comparator<CSQueue> NON_PARTITIONED_QUEUE_COMPARATOR =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
index 3920987e337..19a5647d43c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
@@ -25,8 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.AccessControlException;
@@ -81,7 +81,8 @@ import com.google.common.collect.Sets;
 @Private
 @Unstable
 public class LeafQueue extends AbstractCSQueue {
-  private static final Log LOG = LogFactory.getLog(LeafQueue.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(LeafQueue.class);
 
   private float absoluteUsedCapacity = 0.0f;
 
@@ -168,8 +169,8 @@ public class LeafQueue extends AbstractCSQueue {
   protected void setupQueueConfigs(Resource clusterResource,
       CapacitySchedulerConfiguration conf) throws
       IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       CapacitySchedulerConfiguration schedConf = csContext.getConfiguration();
       super.setupQueueConfigs(clusterResource, conf);
 
@@ -401,8 +402,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   @Override
   public int getNumApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       return getNumPendingApplications() + getNumActiveApplications();
     } finally {
       readLock.unlock();
@@ -410,8 +411,8 @@ public class LeafQueue extends AbstractCSQueue {
   }
 
   public int getNumPendingApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       return pendingOrderingPolicy.getNumSchedulableEntities();
     } finally {
       readLock.unlock();
@@ -419,8 +420,8 @@ public class LeafQueue extends AbstractCSQueue {
   }
 
   public int getNumActiveApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       return orderingPolicy.getNumSchedulableEntities();
     } finally {
       readLock.unlock();
@@ -429,8 +430,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   @Private
   public int getNumPendingApplications(String user) {
+    readLock.lock();
     try {
-      readLock.lock();
       User u = getUser(user);
       if (null == u) {
         return 0;
@@ -443,8 +444,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   @Private
   public int getNumActiveApplications(String user) {
+    readLock.lock();
     try {
-      readLock.lock();
       User u = getUser(user);
       if (null == u) {
         return 0;
@@ -475,8 +476,8 @@ public class LeafQueue extends AbstractCSQueue {
   @Override
   public List<QueueUserACLInfo>
   getQueueUserAclInfo(UserGroupInformation user) {
+    readLock.lock();
     try {
-      readLock.lock();
       QueueUserACLInfo userAclInfo = recordFactory.newRecordInstance(
           QueueUserACLInfo.class);
       List<QueueACL> operations = new ArrayList<>();
@@ -496,8 +497,8 @@ public class LeafQueue extends AbstractCSQueue {
   }
 
   public String toString() {
+    readLock.lock();
     try {
-      readLock.lock();
       return queueName + ": " + "capacity=" + queueCapacities.getCapacity()
           + ", " + "absoluteCapacity=" + queueCapacities.getAbsoluteCapacity()
           + ", " + "usedResources=" + queueUsage.getUsed() + ", "
@@ -521,8 +522,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   @Private
   public List<AppPriorityACLGroup> getPriorityACLs() {
+    readLock.lock();
     try {
-      readLock.lock();
       return new ArrayList<>(priorityAcls);
     } finally {
       readLock.unlock();
@@ -534,8 +535,8 @@ public class LeafQueue extends AbstractCSQueue {
       CapacitySchedulerConfiguration configuration) throws
       IOException {
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       if (!(newlyParsedQueue instanceof LeafQueue) || !newlyParsedQueue
           .getQueuePath().equals(getQueuePath())) {
@@ -581,9 +582,8 @@ public class LeafQueue extends AbstractCSQueue {
   public void submitApplicationAttempt(FiCaSchedulerApp application,
       String userName) {
     // Careful! Locking order is important!
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // TODO, should use getUser, use this method just to avoid UT failure
       // which is caused by wrong invoking order, will fix UT separately
       User user = usersManager.getUserAndAddIfAbsent(userName);
@@ -621,8 +621,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   public void validateSubmitApplication(ApplicationId applicationId,
       String userName, String queue) throws AccessControlException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Check if the queue is accepting jobs
       if (getState() != QueueState.RUNNING) {
         String msg = "Queue " + getQueuePath()
@@ -690,8 +690,9 @@ public class LeafQueue extends AbstractCSQueue {
     if (userName != null && getUser(userName) != null) {
       userWeight = getUser(userName).getWeight();
     }
+
+    readLock.lock();
     try {
-      readLock.lock();
       /*
        * The user am resource limit is based on the same approach as the user
        * limit (as it should represent a subset of that). This means that it uses
@@ -740,8 +741,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   public Resource calculateAndGetAMResourceLimitPerPartition(
       String nodePartition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       /*
        * For non-labeled partition, get the max value from resources currently
        * available to the queue and the absolute resources guaranteed for the
@@ -793,8 +794,8 @@ public class LeafQueue extends AbstractCSQueue {
   }
 
   protected void activateApplications() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // limit of allowed resource usage for application masters
       Map<String, Resource> userAmPartitionLimit =
           new HashMap<String, Resource>();
@@ -915,8 +916,8 @@ public class LeafQueue extends AbstractCSQueue {
   
   private void addApplicationAttempt(FiCaSchedulerApp application,
       User user) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Accept
       user.submitApplication();
       getPendingAppsOrderingPolicy().addSchedulableEntity(application);
@@ -968,9 +969,9 @@ public class LeafQueue extends AbstractCSQueue {
 
   private void removeApplicationAttempt(
       FiCaSchedulerApp application, String userName) {
-    try {
-      writeLock.lock();
 
+    writeLock.lock();
+    try {
       // TODO, should use getUser, use this method just to avoid UT failure
       // which is caused by wrong invoking order, will fix UT separately
       User user = usersManager.getUserAndAddIfAbsent(userName);
@@ -1227,8 +1228,8 @@ public class LeafQueue extends AbstractCSQueue {
 
     // Do not check limits when allocation from a reserved container
     if (allocation.getAllocateFromReservedContainer() == null) {
+      readLock.lock();
       try {
-        readLock.lock();
         FiCaSchedulerApp app =
             schedulerContainer.getSchedulerApplicationAttempt();
         String username = app.getUser();
@@ -1328,9 +1329,8 @@ public class LeafQueue extends AbstractCSQueue {
 
     releaseContainers(cluster, request);
 
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       if (request.anythingAllocatedOrReserved()) {
         ContainerAllocationProposal<FiCaSchedulerApp, FiCaSchedulerNode>
             allocation = request.getFirstAllocatedOrReservedContainer();
@@ -1548,8 +1548,9 @@ public class LeafQueue extends AbstractCSQueue {
   protected boolean canAssignToUser(Resource clusterResource,
       String userName, Resource limit, FiCaSchedulerApp application,
       String nodePartition, ResourceLimits currentResourceLimits) {
+
+    readLock.lock();
     try {
-      readLock.lock();
       User user = getUser(userName);
       if (user == null) {
         if (LOG.isDebugEnabled()) {
@@ -1630,8 +1631,8 @@ public class LeafQueue extends AbstractCSQueue {
    */
   public void recalculateQueueUsageRatio(Resource clusterResource,
       String nodePartition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       ResourceUsage queueResourceUsage = getQueueResourceUsage();
 
       if (nodePartition == null) {
@@ -1660,8 +1661,8 @@ public class LeafQueue extends AbstractCSQueue {
       boolean removed = false;
 
       // Careful! Locking order is important!
+      writeLock.lock();
       try {
-        writeLock.lock();
         Container container = rmContainer.getContainer();
 
         // Inform the application & the node
@@ -1713,8 +1714,8 @@ public class LeafQueue extends AbstractCSQueue {
   void allocateResource(Resource clusterResource,
       SchedulerApplicationAttempt application, Resource resource,
       String nodePartition, RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.allocateResource(clusterResource, resource, nodePartition);
 
       // handle ignore exclusivity container
@@ -1758,8 +1759,8 @@ public class LeafQueue extends AbstractCSQueue {
   void releaseResource(Resource clusterResource,
       FiCaSchedulerApp application, Resource resource, String nodePartition,
       RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.releaseResource(clusterResource, resource, nodePartition);
 
       // handle ignore exclusivity container
@@ -1814,8 +1815,8 @@ public class LeafQueue extends AbstractCSQueue {
   @Override
   public void updateClusterResource(Resource clusterResource,
       ResourceLimits currentResourceLimits) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       updateCurrentResourceLimits(currentResourceLimits, clusterResource);
       lastClusterResource = clusterResource;
 
@@ -1897,8 +1898,8 @@ public class LeafQueue extends AbstractCSQueue {
       return;
     }
     // Careful! Locking order is important!
+    writeLock.lock();
     try {
-      writeLock.lock();
       FiCaSchedulerNode node = scheduler.getNode(
           rmContainer.getContainer().getNodeId());
       allocateResource(clusterResource, attempt,
@@ -1961,8 +1962,8 @@ public class LeafQueue extends AbstractCSQueue {
   public Resource getTotalPendingResourcesConsideringUserLimit(
       Resource clusterResources, String partition,
       boolean deductReservedFromPending) {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<String, Resource> userNameToHeadroom =
           new HashMap<>();
       Resource totalPendingConsideringUserLimit = Resource.newInstance(0, 0);
@@ -2005,8 +2006,8 @@ public class LeafQueue extends AbstractCSQueue {
   @Override
   public void collectSchedulerApplications(
       Collection<ApplicationAttemptId> apps) {
+    readLock.lock();
     try {
-      readLock.lock();
       for (FiCaSchedulerApp pendingApp : pendingOrderingPolicy
           .getSchedulableEntities()) {
         apps.add(pendingApp.getApplicationAttemptId());
@@ -2065,9 +2066,9 @@ public class LeafQueue extends AbstractCSQueue {
   public Map<String, TreeSet<RMContainer>>
       getIgnoreExclusivityRMContainers() {
     Map<String, TreeSet<RMContainer>> clonedMap = new HashMap<>();
-    try {
-      readLock.lock();
 
+    readLock.lock();
+    try {
       for (Map.Entry<String, TreeSet<RMContainer>> entry : ignorePartitionExclusivityRMContainers
           .entrySet()) {
         clonedMap.put(entry.getKey(), new TreeSet<>(entry.getValue()));
@@ -2116,8 +2117,8 @@ public class LeafQueue extends AbstractCSQueue {
   
   void setOrderingPolicy(
       OrderingPolicy<FiCaSchedulerApp> orderingPolicy) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (null != this.orderingPolicy) {
         orderingPolicy.addAllSchedulableEntities(
             this.orderingPolicy.getSchedulableEntities());
@@ -2135,8 +2136,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   public void updateApplicationPriority(SchedulerApplication<FiCaSchedulerApp> app,
       Priority newAppPriority) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       FiCaSchedulerApp attempt = app.getCurrentAppAttempt();
       boolean isActive = orderingPolicy.removeSchedulableEntity(attempt);
       if (!isActive) {
@@ -2187,8 +2188,8 @@ public class LeafQueue extends AbstractCSQueue {
 
   @Override
   public void stopQueue() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (getNumApplications() > 0) {
         updateQueueState(QueueState.DRAINING);
       } else {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ManagedParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ManagedParentQueue.java
index 6788bb4f161..6c40a23f448 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ManagedParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ManagedParentQueue.java
@@ -74,8 +74,8 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   public void reinitialize(CSQueue newlyParsedQueue, Resource clusterResource)
       throws IOException {
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       validate(newlyParsedQueue);
 
       shouldFailAutoCreationWhenGuaranteedCapacityExceeded =
@@ -184,9 +184,9 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   @Override
   public void addChildQueue(CSQueue childQueue)
       throws SchedulerDynamicEditException, IOException {
-    try {
-      writeLock.lock();
 
+    writeLock.lock();
+    try {
       if (childQueue == null || !(childQueue instanceof AutoCreatedLeafQueue)) {
         throw new SchedulerDynamicEditException(
             "Expected child queue to be an instance of AutoCreatedLeafQueue");
@@ -231,8 +231,8 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   }
 
   public List<FiCaSchedulerApp> getScheduleableApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       List<FiCaSchedulerApp> apps = new ArrayList<>();
       for (CSQueue childQueue : getChildQueues()) {
         apps.addAll(((LeafQueue) childQueue).getApplications());
@@ -244,8 +244,8 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   }
 
   public List<FiCaSchedulerApp> getPendingApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       List<FiCaSchedulerApp> apps = new ArrayList<>();
       for (CSQueue childQueue : getChildQueues()) {
         apps.addAll(((LeafQueue) childQueue).getPendingApplications());
@@ -257,8 +257,8 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   }
 
   public List<FiCaSchedulerApp> getAllApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       List<FiCaSchedulerApp> apps = new ArrayList<>();
       for (CSQueue childQueue : getChildQueues()) {
         apps.addAll(((LeafQueue) childQueue).getAllApplications());
@@ -286,9 +286,9 @@ public class ManagedParentQueue extends AbstractManagedParentQueue {
   public void validateAndApplyQueueManagementChanges(
       List<QueueManagementChange> queueManagementChanges)
       throws IOException, SchedulerDynamicEditException {
-    try {
-      writeLock.lock();
 
+    writeLock.lock();
+    try {
       validateQueueManagementChanges(queueManagementChanges);
 
       applyQueueManagementChanges(queueManagementChanges);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
index 6d3794e5300..c9d0324809c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
@@ -28,8 +28,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.security.AccessControlException;
@@ -78,7 +78,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 @Evolving
 public class ParentQueue extends AbstractCSQueue {
 
-  private static final Log LOG = LogFactory.getLog(ParentQueue.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ParentQueue.class);
 
   protected final List<CSQueue> childQueues;
   private final boolean rootQueue;
@@ -125,8 +126,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   protected void setupQueueConfigs(Resource clusterResource)
       throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.setupQueueConfigs(clusterResource);
       StringBuilder aclsString = new StringBuilder();
       for (Map.Entry<AccessType, AccessControlList> e : acls.entrySet()) {
@@ -165,8 +166,8 @@ public class ParentQueue extends AbstractCSQueue {
   private static float PRECISION = 0.0005f; // 0.05% precision
 
   void setChildQueues(Collection<CSQueue> childQueues) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Validate
       float childCapacities = 0;
       Resource minResDefaultLabel = Resources.createResource(0, 0);
@@ -256,8 +257,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public QueueInfo getQueueInfo(
       boolean includeChildQueues, boolean recursive) {
+    readLock.lock();
     try {
-      readLock.lock();
       QueueInfo queueInfo = getQueueInfo();
 
       List<QueueInfo> childQueuesInfo = new ArrayList<>();
@@ -278,8 +279,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   private QueueUserACLInfo getUserAclInfo(
       UserGroupInformation user) {
+    readLock.lock();
     try {
-      readLock.lock();
       QueueUserACLInfo userAclInfo = recordFactory.newRecordInstance(
           QueueUserACLInfo.class);
       List<QueueACL> operations = new ArrayList<QueueACL>();
@@ -301,8 +302,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public List<QueueUserACLInfo> getQueueUserAclInfo(
       UserGroupInformation user) {
+    readLock.lock();
     try {
-      readLock.lock();
       List<QueueUserACLInfo> userAcls = new ArrayList<>();
 
       // Add parent queue acls
@@ -334,8 +335,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public void reinitialize(CSQueue newlyParsedQueue,
       Resource clusterResource) throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       if (!(newlyParsedQueue instanceof ParentQueue) || !newlyParsedQueue
           .getQueuePath().equals(getQueuePath())) {
@@ -429,9 +430,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public void submitApplication(ApplicationId applicationId, String user,
       String queue) throws AccessControlException {
-
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       validateSubmitApplication(applicationId, user, queue);
 
@@ -455,8 +455,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   public void validateSubmitApplication(ApplicationId applicationId,
       String userName, String queue) throws AccessControlException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (queue.equals(queueName)) {
         throw new AccessControlException(
             "Cannot submit application " + "to non-leaf queue: " + queueName);
@@ -486,9 +486,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   private void addApplication(ApplicationId applicationId,
       String user) {
-
+    writeLock.lock();
     try {
-      writeLock.lock();
       ++numApplications;
 
       LOG.info(
@@ -515,8 +514,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   private void removeApplication(ApplicationId applicationId,
       String user) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       --numApplications;
 
       LOG.info("Application removed -" + " appId: " + applicationId + " user: "
@@ -853,8 +852,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   private void internalReleaseResource(Resource clusterResource,
       FiCaSchedulerNode node, Resource releasedResource) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.releaseResource(clusterResource, releasedResource,
           node.getPartition());
 
@@ -890,9 +889,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public void updateClusterResource(Resource clusterResource,
       ResourceLimits resourceLimits) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       // Update effective capacity in all parent queue.
       Set<String> configuredNodelabels = csContext.getConfiguration()
           .getConfiguredNodeLabels(getQueuePath());
@@ -1132,8 +1130,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   @Override
   public List<CSQueue> getChildQueues() {
+    readLock.lock();
     try {
-      readLock.lock();
       return new ArrayList<CSQueue>(childQueues);
     } finally {
       readLock.unlock();
@@ -1152,8 +1150,8 @@ public class ParentQueue extends AbstractCSQueue {
     }
 
     // Careful! Locking order is important!
+    writeLock.lock();
     try {
-      writeLock.lock();
       FiCaSchedulerNode node = scheduler.getNode(
           rmContainer.getContainer().getNodeId());
       allocateResource(clusterResource,
@@ -1176,8 +1174,8 @@ public class ParentQueue extends AbstractCSQueue {
   @Override
   public void collectSchedulerApplications(
       Collection<ApplicationAttemptId> apps) {
+    readLock.lock();
     try {
-      readLock.lock();
       for (CSQueue queue : childQueues) {
         queue.collectSchedulerApplications(apps);
       }
@@ -1232,8 +1230,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   void allocateResource(Resource clusterResource,
       Resource resource, String nodePartition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.allocateResource(clusterResource, resource, nodePartition);
 
       /**
@@ -1330,8 +1328,8 @@ public class ParentQueue extends AbstractCSQueue {
 
       // Do not modify queue when allocation from reserved container
       if (allocation.getAllocateFromReservedContainer() == null) {
+        writeLock.lock();
         try {
-          writeLock.lock();
           // Book-keeping
           // Note: Update headroom to account for current allocation too...
           allocateResource(cluster, allocation.getAllocatedOrReservedResource(),
@@ -1354,8 +1352,8 @@ public class ParentQueue extends AbstractCSQueue {
 
   @Override
   public void stopQueue() {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       if (getNumApplications() > 0) {
         updateQueueState(QueueState.DRAINING);
       } else {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/PlanQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/PlanQueue.java
index 757002f3d78..79afcdc2aaf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/PlanQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/PlanQueue.java
@@ -81,8 +81,8 @@ public class PlanQueue extends AbstractManagedParentQueue {
   @Override
   public void reinitialize(CSQueue newlyParsedQueue,
       Resource clusterResource) throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       if (!(newlyParsedQueue instanceof PlanQueue) || !newlyParsedQueue
           .getQueuePath().equals(getQueuePath())) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueCapacities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueCapacities.java
index 51b9fa827e8..c1b715742ce 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueCapacities.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueCapacities.java
@@ -83,8 +83,8 @@ public class QueueCapacities {
   }
   
   private float _get(String label, CapacityType type) {
+    readLock.lock();
     try {
-      readLock.lock();
       Capacities cap = capacitiesMap.get(label);
       if (null == cap) {
         return LABEL_DOESNT_EXIST_CAP;
@@ -96,8 +96,8 @@ public class QueueCapacities {
   }
   
   private void _set(String label, CapacityType type, float value) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Capacities cap = capacitiesMap.get(label);
       if (null == cap) {
         cap = new Capacities();
@@ -277,8 +277,8 @@ public class QueueCapacities {
    * configurable fields, and load new values
    */
   public void clearConfigurableFields() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       for (String label : capacitiesMap.keySet()) {
         _set(label, CapacityType.CAP, 0);
         _set(label, CapacityType.MAX_CAP, 0);
@@ -291,8 +291,8 @@ public class QueueCapacities {
   }
   
   public Set<String> getExistingNodeLabels() {
+    readLock.lock();
     try {
-      readLock.lock();
       return new HashSet<String>(capacitiesMap.keySet());
     } finally {
       readLock.unlock();
@@ -301,8 +301,8 @@ public class QueueCapacities {
   
   @Override
   public String toString() {
+    readLock.lock();
     try {
-      readLock.lock();
       return this.capacitiesMap.toString();
     } finally {
       readLock.unlock();
@@ -310,8 +310,8 @@ public class QueueCapacities {
   }
   
   public Set<String> getNodePartitionsSet() {
+    readLock.lock();
     try {
-      readLock.lock();
       return capacitiesMap.keySet();
     } finally {
       readLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ReservationQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ReservationQueue.java
index 34f4aa151ab..d59c02bc655 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ReservationQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ReservationQueue.java
@@ -53,8 +53,8 @@ public class ReservationQueue extends AbstractAutoCreatedLeafQueue {
   @Override
   public void reinitialize(CSQueue newlyParsedQueue,
       Resource clusterResource) throws IOException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Sanity check
       if (!(newlyParsedQueue instanceof ReservationQueue) || !newlyParsedQueue
           .getQueuePath().equals(getQueuePath())) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java
index 83ee6c09fcf..470bb119810 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java
@@ -29,8 +29,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -50,7 +50,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 public class UsersManager implements AbstractUsersManager {
 
-  private static final Log LOG = LogFactory.getLog(UsersManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(UsersManager.class);
 
   /*
    * Member declaration for UsersManager class.
@@ -113,8 +114,8 @@ public class UsersManager implements AbstractUsersManager {
     }
 
     private void incUsageRatio(String label, float delta) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         float usage = 0f;
         if (usageRatios.containsKey(label)) {
           usage = usageRatios.get(label);
@@ -127,8 +128,8 @@ public class UsersManager implements AbstractUsersManager {
     }
 
     private float getUsageRatio(String label) {
+      readLock.lock();
       try {
-        readLock.lock();
         Float f = usageRatios.get(label);
         if (null == f) {
           return 0.0f;
@@ -140,8 +141,8 @@ public class UsersManager implements AbstractUsersManager {
     }
 
     private void setUsageRatio(String label, float ratio) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         usageRatios.put(label, ratio);
       } finally {
         writeLock.unlock();
@@ -178,8 +179,8 @@ public class UsersManager implements AbstractUsersManager {
 
     public float setAndUpdateUsageRatio(ResourceCalculator resourceCalculator,
         Resource resource, String nodePartition) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         userUsageRatios.setUsageRatio(nodePartition, 0);
         return updateUsageRatio(resourceCalculator, resource, nodePartition);
       } finally {
@@ -189,8 +190,8 @@ public class UsersManager implements AbstractUsersManager {
 
     public float updateUsageRatio(ResourceCalculator resourceCalculator,
         Resource resource, String nodePartition) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         float delta;
         float newRatio = Resources.ratio(resourceCalculator,
             getUsed(nodePartition), resource);
@@ -357,8 +358,8 @@ public class UsersManager implements AbstractUsersManager {
     // If latestVersionOfUsersState is negative due to overflow, ideally we need
     // to reset it. This method is invoked from UsersManager and LeafQueue and
     // all is happening within write/readLock. Below logic can help to set 0.
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       long value = latestVersionOfUsersState.incrementAndGet();
       if (value < 0) {
@@ -394,8 +395,8 @@ public class UsersManager implements AbstractUsersManager {
    *          User Name
    */
   public void removeUser(String userName) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.users.remove(userName);
 
       // Remove user from active/non-active list as well.
@@ -416,8 +417,8 @@ public class UsersManager implements AbstractUsersManager {
    * @return User object
    */
   public User getUserAndAddIfAbsent(String userName) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       User u = getUser(userName);
       if (null == u) {
         u = new User(userName);
@@ -447,8 +448,8 @@ public class UsersManager implements AbstractUsersManager {
    * @return an ArrayList of UserInfo objects who are active in this queue
    */
   public ArrayList<UserInfo> getUsersInfo() {
+    readLock.lock();
     try {
-      readLock.lock();
       ArrayList<UserInfo> usersToReturn = new ArrayList<UserInfo>();
       for (Map.Entry<String, User> entry : getUsers().entrySet()) {
         User user = entry.getValue();
@@ -493,8 +494,8 @@ public class UsersManager implements AbstractUsersManager {
 
     Map<SchedulingMode, Resource> userLimitPerSchedulingMode;
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       userLimitPerSchedulingMode =
           preComputedActiveUserLimit.get(nodePartition);
       if (isRecomputeNeeded(schedulingMode, nodePartition, true)) {
@@ -552,8 +553,8 @@ public class UsersManager implements AbstractUsersManager {
 
     Map<SchedulingMode, Resource> userLimitPerSchedulingMode;
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       userLimitPerSchedulingMode = preComputedAllUserLimit.get(nodePartition);
       if (isRecomputeNeeded(schedulingMode, nodePartition, false)) {
         // recompute
@@ -601,8 +602,8 @@ public class UsersManager implements AbstractUsersManager {
    */
   private void setLocalVersionOfUsersState(String nodePartition,
       SchedulingMode schedulingMode, boolean isActive) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Map<String, Map<SchedulingMode, Long>> localVersionOfUsersState = (isActive)
           ? localVersionOfActiveUsersState
           : localVersionOfAllUsersState;
@@ -625,8 +626,8 @@ public class UsersManager implements AbstractUsersManager {
    */
   private long getLocalVersionOfUsersState(String nodePartition,
       SchedulingMode schedulingMode, boolean isActive) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       Map<String, Map<SchedulingMode, Long>> localVersionOfUsersState = (isActive)
           ? localVersionOfActiveUsersState
           : localVersionOfAllUsersState;
@@ -824,8 +825,8 @@ public class UsersManager implements AbstractUsersManager {
    *          Cluster Resource
    */
   public void updateUsageRatio(String partition, Resource clusterResource) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Resource resourceByLabel = labelManager.getResourceByLabel(partition,
           clusterResource);
       float consumed = 0;
@@ -851,9 +852,9 @@ public class UsersManager implements AbstractUsersManager {
 
   @Override
   public void activateApplication(String user, ApplicationId applicationId) {
-    try {
-      this.writeLock.lock();
 
+    this.writeLock.lock();
+    try {
       User userDesc = getUser(user);
       if (userDesc != null && userDesc.getActiveApplications() <= 0) {
         return;
@@ -884,9 +885,9 @@ public class UsersManager implements AbstractUsersManager {
 
   @Override
   public void deactivateApplication(String user, ApplicationId applicationId) {
-    try {
-      this.writeLock.lock();
 
+    this.writeLock.lock();
+    try {
       Set<ApplicationId> userApps = usersApplications.get(user);
       if (userApps != null) {
         if (userApps.remove(applicationId)) {
@@ -918,8 +919,8 @@ public class UsersManager implements AbstractUsersManager {
 
   float sumActiveUsersTimesWeights() {
     float count = 0.0f;
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       for (String u : activeUsersSet) {
         count += getUser(u).getWeight();
       }
@@ -931,8 +932,8 @@ public class UsersManager implements AbstractUsersManager {
 
   float sumAllUsersTimesWeights() {
     float count = 0.0f;
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       for (String u : users.keySet()) {
         count += getUser(u).getWeight();
       }
@@ -943,9 +944,8 @@ public class UsersManager implements AbstractUsersManager {
   }
 
   private void updateActiveUsersResourceUsage(String userName) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
-
       // For UT case: We might need to add the user to users list.
       User user = getUserAndAddIfAbsent(userName);
       ResourceUsage resourceUsage = user.getResourceUsage();
@@ -982,8 +982,8 @@ public class UsersManager implements AbstractUsersManager {
   }
 
   private void updateNonActiveUsersResourceUsage(String userName) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
 
       // For UT case: We might need to add the user to users list.
       User user = getUser(userName);
@@ -1051,8 +1051,8 @@ public class UsersManager implements AbstractUsersManager {
    */
   public User updateUserResourceUsage(String userName, Resource resource,
       String nodePartition, boolean isAllocate) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
 
       // TODO, should use getUser, use this method just to avoid UT failure
       // which is caused by wrong invoking order, will fix UT separately
@@ -1098,8 +1098,8 @@ public class UsersManager implements AbstractUsersManager {
   }
 
   public void updateUserWeights() {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       for (Map.Entry<String, User> ue : users.entrySet()) {
         ue.getValue().setWeight(getUserWeightFromQueue(ue.getKey()));
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/AbstractContainerAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/AbstractContainerAllocator.java
index bfc129f526f..829625220e0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/AbstractContainerAllocator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/AbstractContainerAllocator.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.allocator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
@@ -43,7 +43,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
  * extensible.
  */
 public abstract class AbstractContainerAllocator {
-  private static final Log LOG = LogFactory.getLog(AbstractContainerAllocator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractContainerAllocator.class);
 
   FiCaSchedulerApp application;
   AppSchedulingInfo appInfo;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/RegularContainerAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/RegularContainerAllocator.java
index c692fdf8afb..5bf2a0d4a0a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/RegularContainerAllocator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/allocator/RegularContainerAllocator.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.Priority;
@@ -63,7 +63,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
  * delayed scheduling mechanism to get better locality allocation.
  */
 public class RegularContainerAllocator extends AbstractContainerAllocator {
-  private static final Log LOG = LogFactory.getLog(RegularContainerAllocator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RegularContainerAllocator.class);
 
   public RegularContainerAllocator(FiCaSchedulerApp application,
       ResourceCalculator rc, RMContext rmContext,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java
index 2a24887f72b..3ef97a02119 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/FSSchedulerConfigurationStore.java
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.GsonBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
@@ -45,7 +45,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
  * configuration storage in FileSystem
  */
 public class FSSchedulerConfigurationStore extends YarnConfigurationStore {
-  public static final Log LOG = LogFactory.getLog(
+  public static final Logger LOG = LoggerFactory.getLogger(
       FSSchedulerConfigurationStore.class);
 
   @VisibleForTesting
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java
index 21de7a26d61..4eb328cf9bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/LeveldbConfigurationStore.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -62,8 +62,8 @@ import static org.fusesource.leveldbjni.JniDBFactory.bytes;
  */
 public class LeveldbConfigurationStore extends YarnConfigurationStore {
 
-  public static final Log LOG =
-      LogFactory.getLog(LeveldbConfigurationStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(LeveldbConfigurationStore.class);
 
   private static final String DB_NAME = "yarn-conf-store";
   private static final String LOG_KEY = "log";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/MutableCSConfigurationProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/MutableCSConfigurationProvider.java
index 51de4370666..6a13d2d911e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/MutableCSConfigurationProvider.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/MutableCSConfigurationProvider.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -49,8 +49,8 @@ import java.util.Map;
 public class MutableCSConfigurationProvider implements CSConfigurationProvider,
     MutableConfigurationProvider {
 
-  public static final Log LOG =
-      LogFactory.getLog(MutableCSConfigurationProvider.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(MutableCSConfigurationProvider.class);
 
   private Configuration schedConf;
   private Configuration oldConf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
index ef0a44b0789..2cc831f179b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStore.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.server.records.Version;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
@@ -46,8 +46,8 @@ import java.util.Map;
  */
 public abstract class YarnConfigurationStore {
 
-  public static final Log LOG =
-      LogFactory.getLog(YarnConfigurationStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(YarnConfigurationStore.class);
   /**
    * LogMutation encapsulates the fields needed for configuration mutation
    * audit logging and recovery.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStoreFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStoreFactory.java
index 60249c849f9..af637d41f8e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStoreFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/YarnConfigurationStoreFactory.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -29,7 +29,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  */
 public final class YarnConfigurationStoreFactory {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       YarnConfigurationStoreFactory.class);
 
   private YarnConfigurationStoreFactory() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java
index d9fd0e4a414..c4e06cb79fb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/ZKConfigurationStore.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.curator.ZKCuratorManager;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -45,8 +45,8 @@ import java.util.Map;
  */
 public class ZKConfigurationStore extends YarnConfigurationStore {
 
-  public static final Log LOG =
-      LogFactory.getLog(ZKConfigurationStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(ZKConfigurationStore.class);
 
   private long maxLogs;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/preemption/PreemptionManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/preemption/PreemptionManager.java
index 76fcd4a9f81..ae070872074 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/preemption/PreemptionManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/preemption/PreemptionManager.java
@@ -43,8 +43,8 @@ public class PreemptionManager {
   }
 
   public void refreshQueues(CSQueue parent, CSQueue current) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       PreemptableQueue parentEntity = null;
       if (parent != null) {
         parentEntity = entities.get(parent.getQueueName());
@@ -67,8 +67,8 @@ public class PreemptionManager {
   }
 
   public void addKillableContainer(KillableContainer container) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       PreemptableQueue entity = entities.get(container.getLeafQueueName());
       if (null != entity) {
         entity.addKillableContainer(container);
@@ -80,8 +80,8 @@ public class PreemptionManager {
   }
 
   public void removeKillableContainer(KillableContainer container) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       PreemptableQueue entity = entities.get(container.getLeafQueueName());
       if (null != entity) {
         entity.removeKillableContainer(container);
@@ -106,8 +106,8 @@ public class PreemptionManager {
   @VisibleForTesting
   public Map<ContainerId, RMContainer> getKillableContainersMap(
       String queueName, String partition) {
+    readLock.lock();
     try {
-      readLock.lock();
       PreemptableQueue entity = entities.get(queueName);
       if (entity != null) {
         Map<ContainerId, RMContainer> containers =
@@ -129,8 +129,8 @@ public class PreemptionManager {
   }
 
   public Resource getKillableResource(String queueName, String partition) {
+    readLock.lock();
     try {
-      readLock.lock();
       PreemptableQueue entity = entities.get(queueName);
       if (entity != null) {
         Resource res = entity.getTotalKillableResources().get(partition);
@@ -147,8 +147,8 @@ public class PreemptionManager {
   }
 
   public Map<String, PreemptableQueue> getShallowCopyOfPreemptableQueues() {
+    readLock.lock();
     try {
-      readLock.lock();
       Map<String, PreemptableQueue> map = new HashMap<>();
       for (Map.Entry<String, PreemptableQueue> entry : entities.entrySet()) {
         String key = entry.getKey();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java
index faa6e6f54a9..b1d3f747ff3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java
@@ -202,8 +202,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
         new HashMap<String, Float>();
 
     private float getAbsoluteActivatedChildQueueCapacity(String nodeLabel) {
+      readLock.lock();
       try {
-        readLock.lock();
         Float totalActivatedCapacity = getAbsActivatedChildQueueCapacityByLabel(
             nodeLabel);
         if (totalActivatedCapacity != null) {
@@ -218,8 +218,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
 
     private void incAbsoluteActivatedChildCapacity(String nodeLabel,
         float childQueueCapacity) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         Float activatedChildCapacity = getAbsActivatedChildQueueCapacityByLabel(
             nodeLabel);
         if (activatedChildCapacity != null) {
@@ -236,8 +236,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
 
     private void decAbsoluteActivatedChildCapacity(String nodeLabel,
         float childQueueCapacity) {
+      writeLock.lock();
       try {
-        writeLock.lock();
         Float activatedChildCapacity = getAbsActivatedChildQueueCapacityByLabel(
             nodeLabel);
         if (activatedChildCapacity != null) {
@@ -360,8 +360,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
     //synch/add missing leaf queue(s) if any to state
     updateLeafQueueState();
 
+    readLock.lock();
     try {
-      readLock.lock();
       List<QueueManagementChange> queueManagementChanges = new ArrayList<>();
       List<FiCaSchedulerApp> pendingApps = getSortedPendingApplications();
 
@@ -483,8 +483,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
 
   @VisibleForTesting
   void updateLeafQueueState() {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Set<String> newPartitions = new HashSet<>();
       Set<String> newQueues = new HashSet<>();
 
@@ -570,8 +570,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
   @VisibleForTesting
   public boolean isActive(final AutoCreatedLeafQueue leafQueue,
       String nodeLabel) throws SchedulerDynamicEditException {
+    readLock.lock();
     try {
-      readLock.lock();
       LeafQueueStatePerPartition leafQueueStatus = getLeafQueueState(leafQueue,
           nodeLabel);
       return leafQueueStatus.isActive();
@@ -649,8 +649,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
   public void commitQueueManagementChanges(
       List<QueueManagementChange> queueManagementChanges)
       throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       for (QueueManagementChange queueManagementChange :
           queueManagementChanges) {
         AutoCreatedLeafQueueConfig updatedQueueTemplate =
@@ -695,8 +695,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
 
   private void activate(final AbstractAutoCreatedLeafQueue leafQueue,
       String nodeLabel) throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       getLeafQueueState(leafQueue, nodeLabel).activate();
       parentQueueState.incAbsoluteActivatedChildCapacity(nodeLabel,
           leafQueueTemplateCapacities.getAbsoluteCapacity(nodeLabel));
@@ -707,8 +707,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
 
   private void deactivate(final AbstractAutoCreatedLeafQueue leafQueue,
       String nodeLabel) throws SchedulerDynamicEditException {
+    writeLock.lock();
     try {
-      writeLock.lock();
       getLeafQueueState(leafQueue, nodeLabel).deactivate();
 
       parentQueueState.decAbsoluteActivatedChildCapacity(nodeLabel,
@@ -765,9 +765,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
               .getClass());
     }
 
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       QueueCapacities capacities = new QueueCapacities(false);
       for (String nodeLabel : leafQueueTemplateNodeLabels) {
         if (!leafQueueState.createLeafQueueStateIfNotExists(leafQueue,
@@ -816,8 +815,8 @@ public class GuaranteedOrZeroCapacityOverTimePolicy
   @VisibleForTesting
   LeafQueueStatePerPartition getLeafQueueState(LeafQueue queue,
       String partition) throws SchedulerDynamicEditException {
+    readLock.lock();
     try {
-      readLock.lock();
       String queueName = queue.getQueueName();
       if (!leafQueueState.containsLeafQueue(queueName, partition)) {
         throw new SchedulerDynamicEditException(
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index d0e8220697a..2010711c459 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -27,8 +27,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -98,7 +98,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 @Unstable
 public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
-  private static final Log LOG = LogFactory.getLog(FiCaSchedulerApp.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FiCaSchedulerApp.class);
 
   private final Set<ContainerId> containersToPreempt =
     new HashSet<ContainerId>();
@@ -200,8 +201,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
   public boolean containerCompleted(RMContainer rmContainer,
       ContainerStatus containerStatus, RMContainerEventType event,
       String partition) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       ContainerId containerId = rmContainer.getContainerId();
 
       // Remove from the list of containers
@@ -245,8 +246,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
 
   public RMContainer allocate(FiCaSchedulerNode node,
       SchedulerRequestKey schedulerKey, Container container) {
+    readLock.lock();
     try {
-      readLock.lock();
 
       if (isStopped) {
         return null;
@@ -437,8 +438,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
     ContainerRequest containerRequest = null;
     boolean reReservation = false;
 
+    readLock.lock();
     try {
-      readLock.lock();
 
       // First make sure no container in release list in final state
       if (anyContainerInFinalState(request)) {
@@ -560,8 +561,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
       FiCaSchedulerNode> request, boolean updatePending) {
     boolean reReservation = false;
 
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       // If we allocated something
       if (request.anythingAllocatedOrReserved()) {
@@ -692,8 +693,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
 
   public boolean unreserve(SchedulerRequestKey schedulerKey,
       FiCaSchedulerNode node, RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Done with the reservation?
       if (internalUnreserve(node, schedulerKey)) {
         node.unreserveResource(this);
@@ -748,8 +749,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
   }
 
   public Map<String, Resource> getTotalPendingRequestsPerPartition() {
+    readLock.lock();
     try {
-      readLock.lock();
 
       Map<String, Resource> ret = new HashMap<>();
       for (SchedulerRequestKey schedulerKey : appSchedulingInfo
@@ -780,8 +781,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
   }
 
   public void markContainerForPreemption(ContainerId cont) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       // ignore already completed containers
       if (liveContainers.containsKey(cont)) {
         containersToPreempt.add(cont);
@@ -803,8 +804,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
    */
   public Allocation getAllocation(ResourceCalculator resourceCalculator,
       Resource clusterResource, Resource minimumAllocation) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Set<ContainerId> currentContPreemption = Collections.unmodifiableSet(
           new HashSet<ContainerId>(containersToPreempt));
       containersToPreempt.clear();
@@ -872,8 +873,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
 
   public void setHeadroomProvider(
     CapacityHeadroomProvider headroomProvider) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       this.headroomProvider = headroomProvider;
     } finally {
       writeLock.unlock();
@@ -882,8 +883,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
 
   @Override
   public Resource getHeadroom() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (headroomProvider != null) {
         return headroomProvider.getHeadroom();
       }
@@ -897,8 +898,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
   @Override
   public void transferStateFromPreviousAttempt(
       SchedulerApplicationAttempt appAttempt) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       super.transferStateFromPreviousAttempt(appAttempt);
       this.headroomProvider = ((FiCaSchedulerApp) appAttempt).headroomProvider;
     } finally {
@@ -925,8 +926,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
   @VisibleForTesting
   public RMContainer findNodeToUnreserve(FiCaSchedulerNode node,
       SchedulerRequestKey schedulerKey, Resource minimumUnreservedResource) {
+    readLock.lock();
     try {
-      readLock.lock();
       // need to unreserve some other container first
       NodeId idToUnreserve = getNodeIdToUnreserve(schedulerKey,
           minimumUnreservedResource, rc);
@@ -1107,11 +1108,11 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
    */
   @Override
   public ApplicationResourceUsageReport getResourceUsageReport() {
+    writeLock.lock();
     try {
       // Use write lock here because
       // SchedulerApplicationAttempt#getResourceUsageReport updated fields
       // TODO: improve this
-      writeLock.lock();
       ApplicationResourceUsageReport report = super.getResourceUsageReport();
       Resource cluster = rmContext.getScheduler().getClusterResource();
       Resource totalPartitionRes =
@@ -1174,8 +1175,8 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
    */
   public boolean moveReservation(RMContainer reservedContainer,
       FiCaSchedulerNode sourceNode, FiCaSchedulerNode targetNode) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       if (!sourceNode.getPartition().equals(targetNode.getPartition())) {
         if (LOG.isDebugEnabled()) {
           LOG.debug(
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerNode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerNode.java
index 7277779b1c7..8bee0f8fe6a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerNode.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerNode.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -40,7 +40,8 @@ import java.util.Set;
 
 public class FiCaSchedulerNode extends SchedulerNode {
 
-  private static final Log LOG = LogFactory.getLog(FiCaSchedulerNode.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FiCaSchedulerNode.class);
   private Map<ContainerId, RMContainer> killableContainers = new HashMap<>();
   private Resource totalKillableResources = Resource.newInstance(0, 0);
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
index bf046724075..943613848ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
@@ -83,8 +83,8 @@ public class MemoryPlacementConstraintManager
       Map<Set<String>, PlacementConstraint> constraintMap) {
     // Check if app already exists. If not, prepare its constraint map.
     Map<String, PlacementConstraint> constraintsForApp = new HashMap<>();
+    readLock.lock();
     try {
-      readLock.lock();
       if (appConstraints.get(appId) != null) {
         LOG.warn("Application {} has already been registered.", appId);
         return;
@@ -109,8 +109,8 @@ public class MemoryPlacementConstraintManager
           appId);
     }
     // Update appConstraints.
+    writeLock.lock();
     try {
-      writeLock.lock();
       appConstraints.put(appId, constraintsForApp);
     } finally {
       writeLock.unlock();
@@ -120,8 +120,8 @@ public class MemoryPlacementConstraintManager
   @Override
   public void addConstraint(ApplicationId appId, Set<String> sourceTags,
       PlacementConstraint placementConstraint, boolean replace) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Map<String, PlacementConstraint> constraintsForApp =
           appConstraints.get(appId);
       if (constraintsForApp == null) {
@@ -140,8 +140,8 @@ public class MemoryPlacementConstraintManager
   @Override
   public void addGlobalConstraint(Set<String> sourceTags,
       PlacementConstraint placementConstraint, boolean replace) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       addConstraintToMap(globalConstraints, sourceTags, placementConstraint,
           replace);
     } finally {
@@ -181,8 +181,8 @@ public class MemoryPlacementConstraintManager
   @Override
   public Map<Set<String>, PlacementConstraint> getConstraints(
       ApplicationId appId) {
+    readLock.lock();
     try {
-      readLock.lock();
       if (appConstraints.get(appId) == null) {
         if (LOG.isDebugEnabled()) {
           LOG.debug("Application {} is not registered in the Placement "
@@ -212,8 +212,8 @@ public class MemoryPlacementConstraintManager
       return null;
     }
     String sourceTag = getValidSourceTag(sourceTags);
+    readLock.lock();
     try {
-      readLock.lock();
       if (appConstraints.get(appId) == null) {
         if (LOG.isDebugEnabled()) {
           LOG.debug("Application {} is not registered in the Placement "
@@ -235,8 +235,8 @@ public class MemoryPlacementConstraintManager
       return null;
     }
     String sourceTag = getValidSourceTag(sourceTags);
+    readLock.lock();
     try {
-      readLock.lock();
       return globalConstraints.get(sourceTag);
     } finally {
       readLock.unlock();
@@ -284,8 +284,8 @@ public class MemoryPlacementConstraintManager
 
   @Override
   public void unregisterApplication(ApplicationId appId) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       appConstraints.remove(appId);
     } finally {
       writeLock.unlock();
@@ -298,8 +298,8 @@ public class MemoryPlacementConstraintManager
       return;
     }
     String sourceTag = getValidSourceTag(sourceTags);
+    writeLock.lock();
     try {
-      writeLock.lock();
       globalConstraints.remove(sourceTag);
     } finally {
       writeLock.unlock();
@@ -308,8 +308,8 @@ public class MemoryPlacementConstraintManager
 
   @Override
   public int getNumRegisteredApplications() {
+    readLock.lock();
     try {
-      readLock.lock();
       return appConstraints.size();
     } finally {
       readLock.unlock();
@@ -318,8 +318,8 @@ public class MemoryPlacementConstraintManager
 
   @Override
   public int getNumGlobalConstraints() {
+    readLock.lock();
     try {
-      readLock.lock();
       return globalConstraints.size();
     } finally {
       readLock.unlock();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintManagerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintManagerService.java
index 967f2514428..58d41ec67da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintManagerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintManagerService.java
@@ -22,8 +22,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.constraint;
 
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.service.AbstractService;
@@ -37,8 +37,8 @@ import org.apache.hadoop.yarn.api.resource.PlacementConstraint;
 public abstract class PlacementConstraintManagerService extends AbstractService
     implements PlacementConstraintManager {
 
-  protected static final Log LOG =
-      LogFactory.getLog(PlacementConstraintManagerService.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(PlacementConstraintManagerService.class);
 
   private PlacementConstraintManager placementConstraintManager = null;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintsUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintsUtil.java
index 02272969dc6..28a528631fc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintsUtil.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/PlacementConstraintsUtil.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.constraint;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.*;
@@ -48,8 +48,8 @@ import static org.apache.hadoop.yarn.api.resource.PlacementConstraints.NODE_PART
 @Public
 @Unstable
 public final class PlacementConstraintsUtil {
-  private static final Log LOG =
-      LogFactory.getLog(PlacementConstraintsUtil.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PlacementConstraintsUtil.class);
 
   // Suppresses default constructor, ensuring non-instantiability.
   private PlacementConstraintsUtil() {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/distributed/NodeQueueLoadMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/distributed/NodeQueueLoadMonitor.java
index e9890999454..b61297a0254 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/distributed/NodeQueueLoadMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/distributed/NodeQueueLoadMonitor.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.distributed;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.ResourceOption;
 import org.apache.hadoop.yarn.server.api.protocolrecords.NMContainerStatus;
@@ -47,7 +47,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public class NodeQueueLoadMonitor implements ClusterMonitor {
 
-  final static Log LOG = LogFactory.getLog(NodeQueueLoadMonitor.class);
+  final static Logger LOG = LoggerFactory.
+      getLogger(NodeQueueLoadMonitor.class);
 
   /**
    * The comparator used to specify the metric against which the load
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
index 3300948ce70..b92bd5dab73 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
@@ -18,8 +18,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -59,7 +59,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.alloc
 @Unstable
 public class AllocationFileLoaderService extends AbstractService {
 
-  public static final Log LOG = LogFactory.getLog(
+  public static final Logger LOG = LoggerFactory.getLogger(
       AllocationFileLoaderService.class.getName());
 
   /** Time to wait between checks of the allocation file */
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java
index 4f5b4253b06..d5a1f4c2621 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -70,7 +70,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 public class FSAppAttempt extends SchedulerApplicationAttempt
     implements Schedulable {
 
-  private static final Log LOG = LogFactory.getLog(FSAppAttempt.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FSAppAttempt.class);
   private static final DefaultResourceCalculator RESOURCE_CALCULATOR
       = new DefaultResourceCalculator();
 
@@ -131,8 +132,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
 
   void containerCompleted(RMContainer rmContainer,
       ContainerStatus containerStatus, RMContainerEventType event) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Container container = rmContainer.getContainer();
       ContainerId containerId = container.getId();
 
@@ -181,8 +182,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
 
   private void unreserveInternal(
       SchedulerRequestKey schedulerKey, FSSchedulerNode node) {
+    writeLock.lock();
     try {
-      writeLock.lock();
       Map<NodeId, RMContainer> reservedContainers = this.reservedContainers.get(
           schedulerKey);
       RMContainer reservedContainer = reservedContainers.remove(
@@ -284,8 +285,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
       return NodeType.OFF_SWITCH;
     }
 
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       // Default level is NODE_LOCAL
       if (!allowedLocalityLevel.containsKey(schedulerKey)) {
@@ -354,8 +355,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
       return NodeType.OFF_SWITCH;
     }
 
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       // default level is NODE_LOCAL
       if (!allowedLocalityLevel.containsKey(schedulerKey)) {
@@ -425,8 +426,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
     RMContainer rmContainer;
     Container container;
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       // Update allowed locality level
       NodeType allowed = allowedLocalityLevel.get(schedulerKey);
       if (allowed != null) {
@@ -498,8 +499,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
   void resetAllowedLocalityLevel(
       SchedulerRequestKey schedulerKey, NodeType level) {
     NodeType old;
+    writeLock.lock();
     try {
-      writeLock.lock();
       old = allowedLocalityLevel.put(schedulerKey, level);
     } finally {
       writeLock.unlock();
@@ -664,9 +665,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
   @Override
   public synchronized void recoverContainer(SchedulerNode node,
       RMContainer rmContainer) {
+    writeLock.lock();
     try {
-      writeLock.lock();
-
       super.recoverContainer(node, rmContainer);
 
       if (!rmContainer.getState().equals(RMContainerState.COMPLETED)) {
@@ -776,8 +776,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
     String rackName =
         node.getRackName() == null ? "NULL" : node.getRackName();
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       Set<String> rackReservations = reservations.get(rackName);
       if (rackReservations == null) {
         rackReservations = new HashSet<>();
@@ -793,8 +793,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
     String rackName =
         node.getRackName() == null ? "NULL" : node.getRackName();
 
+    writeLock.lock();
     try {
-      writeLock.lock();
       Set<String> rackReservations = reservations.get(rackName);
       if (rackReservations != null) {
         rackReservations.remove(node.getNodeName());
@@ -963,8 +963,8 @@ public class FSAppAttempt extends SchedulerApplicationAttempt
     // For each priority, see if we can schedule a node local, rack local
     // or off-switch request. Rack of off-switch requests may be delayed
     // (not scheduled) in order to promote better locality.
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       // TODO (wandga): All logics in this method should be added to
       // SchedulerPlacement#canDelayTo which is independent from scheduler.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
index 044254ddad7..e7ff72547d1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
@@ -31,8 +31,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.TreeSet;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -54,7 +54,8 @@ import static org.apache.hadoop.yarn.util.resource.Resources.none;
 @Private
 @Unstable
 public class FSLeafQueue extends FSQueue {
-  private static final Log LOG = LogFactory.getLog(FSLeafQueue.class.getName());
+  private static final Logger LOG = LoggerFactory.
+      getLogger(FSLeafQueue.class.getName());
   private static final List<FSQueue> EMPTY_LIST = Collections.emptyList();
 
   private FSContext context;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
index 56a490b8313..bb3dffc5621 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
@@ -27,8 +27,8 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -44,7 +44,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicat
 @Private
 @Unstable
 public class FSParentQueue extends FSQueue {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       FSParentQueue.class.getName());
 
   private final List<FSQueue> childQueues = new ArrayList<>();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java
index 4c830523cb4..e664725af31 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerStatus;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -40,7 +40,8 @@ import java.util.concurrent.locks.Lock;
  * Thread that handles FairScheduler preemption.
  */
 class FSPreemptionThread extends Thread {
-  private static final Log LOG = LogFactory.getLog(FSPreemptionThread.class);
+  private static final Logger LOG = LoggerFactory.
+      getLogger(FSPreemptionThread.class);
   protected final FSContext context;
   private final FairScheduler scheduler;
   private final long warnTimeBeforeKill;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
index b64f783af4d..984b2c0b355 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
@@ -23,8 +23,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.ipc.Server;
@@ -51,7 +51,7 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 @Unstable
 public abstract class FSQueue implements Queue, Schedulable {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       FSQueue.class.getName());
 
   private Resource fairShare = Resources.createResource(0, 0);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java
index 44ec9c3bc80..8ae1e2a2f99 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -50,7 +50,8 @@ import java.util.concurrent.ConcurrentSkipListSet;
 @Unstable
 public class FSSchedulerNode extends SchedulerNode {
 
-  private static final Log LOG = LogFactory.getLog(FSSchedulerNode.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FSSchedulerNode.class);
   private FSAppAttempt reservedAppSchedulable;
   // Stores list of containers still to be preempted
   @VisibleForTesting
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
index 394ac59c5e9..a267639702e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
@@ -22,8 +22,8 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -147,9 +147,10 @@ public class FairScheduler extends
   private QueueManager queueMgr;
   private boolean usePortForNodeName;
 
-  private static final Log LOG = LogFactory.getLog(FairScheduler.class);
-  private static final Log STATE_DUMP_LOG =
-      LogFactory.getLog(FairScheduler.class.getName() + ".statedump");
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FairScheduler.class);
+  private static final Logger STATE_DUMP_LOG =
+      LoggerFactory.getLogger(FairScheduler.class.getName() + ".statedump");
 
   private static final ResourceCalculator RESOURCE_CALCULATOR =
       new DefaultResourceCalculator();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
index 3fa6d85fb50..e6b1de4e7f0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.conf.Configuration;
@@ -43,7 +43,7 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 @Evolving
 public class FairSchedulerConfiguration extends Configuration {
 
-  public static final Log LOG = LogFactory.getLog(
+  public static final Logger LOG = LoggerFactory.getLogger(
       FairSchedulerConfiguration.class.getName());
 
   /**
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java
index 3f1ad0de174..862674d45e7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java
@@ -24,8 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ArrayListMultimap;
@@ -37,7 +37,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicat
  * constraints
  */
 public class MaxRunningAppsEnforcer {
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       MaxRunningAppsEnforcer.class);
   
   private final FairScheduler scheduler;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
index a9c06780069..6a1f953249d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
@@ -33,8 +33,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -54,8 +54,8 @@ import java.util.Set;
 @Private
 @Unstable
 public class QueueManager {
-  private static final Log LOG =
-      LogFactory.getLog(QueueManager.class.getName());
+  private static final Logger LOG =
+      LoggerFactory.getLogger(QueueManager.class.getName());
 
   private final class IncompatibleQueueRemovalTask {
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java
index 2c4add4e258..1d48a218835 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.security.Groups;
@@ -40,8 +40,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Unstable
 public abstract class QueuePlacementRule {
   protected boolean create;
-  public static final Log LOG =
-      LogFactory.getLog(QueuePlacementRule.class.getName());
+  public static final Logger LOG =
+      LoggerFactory.getLogger(QueuePlacementRule.class.getName());
 
   /**
    * Initializes the rule with any arguments.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/VisitedResourceRequestTracker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/VisitedResourceRequestTracker.java
index f157263eb5d..7dac0c3d14d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/VisitedResourceRequestTracker.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/VisitedResourceRequestTracker.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
@@ -39,8 +39,8 @@ import java.util.Set;
  * The implementation is not thread-safe.
  */
 class VisitedResourceRequestTracker {
-  private static final Log LOG =
-      LogFactory.getLog(VisitedResourceRequestTracker.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(VisitedResourceRequestTracker.class);
   private final Map<Priority, Map<Resource, TrackerPerPriorityResource>> map =
       new HashMap<>();
   private final ClusterNodeTracker<FSSchedulerNode> nodeTracker;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
index 0b5c10b7daa..0b412d3ee00 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FairSharePolicy.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -44,7 +44,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class FairSharePolicy extends SchedulingPolicy {
   @VisibleForTesting
   public static final String NAME = "fair";
-  private static final Log LOG = LogFactory.getLog(FairSharePolicy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FairSharePolicy.class);
   private static final String MEMORY = ResourceInformation.MEMORY_MB.getName();
   private static final DefaultResourceCalculator RESOURCE_CALCULATOR =
       new DefaultResourceCalculator();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
index 7dd45cb9f39..365340151fc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -38,7 +38,8 @@ import com.google.common.annotations.VisibleForTesting;
 @Private
 @Unstable
 public class FifoPolicy extends SchedulingPolicy {
-  private static final Log LOG = LogFactory.getLog(FifoPolicy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FifoPolicy.class);
 
   @VisibleForTesting
   public static final String NAME = "FIFO";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoAppAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoAppAttempt.java
index 074d5da8303..05a5d7bad02 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoAppAttempt.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoAppAttempt.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -43,7 +43,8 @@ import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
 import java.util.List;
 
 public class FifoAppAttempt extends FiCaSchedulerApp {
-  private static final Log LOG = LogFactory.getLog(FifoAppAttempt.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FifoAppAttempt.class);
 
   FifoAppAttempt(ApplicationAttemptId appAttemptId, String user,
       Queue queue, ActiveUsersManager activeUsersManager,
@@ -53,9 +54,9 @@ public class FifoAppAttempt extends FiCaSchedulerApp {
 
   public RMContainer allocate(NodeType type, FiCaSchedulerNode node,
       SchedulerRequestKey schedulerKey, Container container) {
-    try {
-      writeLock.lock();
 
+    writeLock.lock();
+    try {
       if (isStopped) {
         return null;
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
index 8396db54ad8..dd64f6d9bf1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.conf.Configurable;
@@ -108,7 +108,8 @@ public class FifoScheduler extends
     AbstractYarnScheduler<FifoAppAttempt, FiCaSchedulerNode> implements
     Configurable {
 
-  private static final Log LOG = LogFactory.getLog(FifoScheduler.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FifoScheduler.class);
 
   private static final RecordFactory recordFactory = 
     RecordFactoryProvider.getRecordFactory(null);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/LocalityAppPlacementAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/LocalityAppPlacementAllocator.java
index 45573505c2e..d0677c37cab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/LocalityAppPlacementAllocator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/LocalityAppPlacementAllocator.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement;
 
 import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
 import org.apache.hadoop.yarn.api.records.SchedulingRequest;
 import org.apache.hadoop.yarn.exceptions.SchedulerInvalidResoureRequestException;
@@ -51,8 +51,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public class LocalityAppPlacementAllocator <N extends SchedulerNode>
     extends AppPlacementAllocator<N> {
-  private static final Log LOG =
-      LogFactory.getLog(LocalityAppPlacementAllocator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(LocalityAppPlacementAllocator.class);
 
   private final Map<String, ResourceRequest> resourceRequestMap =
       new ConcurrentHashMap<>();
@@ -155,9 +155,9 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
   public PendingAskUpdateResult updatePendingAsk(
       Collection<ResourceRequest> requests,
       boolean recoverPreemptedRequestForAContainer) {
-    try {
-      this.writeLock.lock();
 
+    this.writeLock.lock();
+    try {
       PendingAskUpdateResult updateResult = null;
 
       // Update resource requests
@@ -228,8 +228,8 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
 
   @Override
   public PendingAsk getPendingAsk(String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       ResourceRequest request = getResourceRequest(resourceName);
       if (null == request) {
         return PendingAsk.ZERO;
@@ -245,8 +245,8 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
 
   @Override
   public int getOutstandingAsksCount(String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       ResourceRequest request = getResourceRequest(resourceName);
       if (null == request) {
         return 0;
@@ -353,8 +353,8 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
 
   @Override
   public boolean canAllocate(NodeType type, SchedulerNode node) {
+    readLock.lock();
     try {
-      readLock.lock();
       ResourceRequest r = resourceRequestMap.get(
           ResourceRequest.ANY);
       if (r == null || r.getNumContainers() <= 0) {
@@ -381,8 +381,8 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
 
   @Override
   public boolean canDelayTo(String resourceName) {
+    readLock.lock();
     try {
-      readLock.lock();
       ResourceRequest request = getResourceRequest(resourceName);
       return request == null || request.getRelaxLocality();
     } finally {
@@ -432,8 +432,8 @@ public class LocalityAppPlacementAllocator <N extends SchedulerNode>
   @Override
   public ContainerRequest allocate(SchedulerRequestKey schedulerKey,
       NodeType type, SchedulerNode node) {
+    writeLock.lock();
     try {
-      writeLock.lock();
 
       List<ResourceRequest> resourceRequests = new ArrayList<>();
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
index 7e27c34e268..a757ea527af 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSorter.java
@@ -29,8 +29,8 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.util.ReflectionUtils;
@@ -50,7 +50,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class MultiNodeSorter<N extends SchedulerNode> extends AbstractService {
 
   private MultiNodeLookupPolicy<N> multiNodePolicy;
-  private static final Log LOG = LogFactory.getLog(MultiNodeSorter.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(MultiNodeSorter.class);
 
   // ScheduledExecutorService which schedules the PreemptionChecker to run
   // periodically.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
index e872317f715..c8a7e66f5fe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/MultiNodeSortingManager.java
@@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.service.AbstractService;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
@@ -40,8 +40,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
 public class MultiNodeSortingManager<N extends SchedulerNode>
     extends AbstractService {
 
-  private static final Log LOG = LogFactory
-      .getLog(MultiNodeSortingManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(MultiNodeSortingManager.class);
 
   private RMContext rmContext;
   private Map<String, MultiNodeSorter<N>> runningMultiNodeSorters;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java
index 54e46667296..f4da4d04c38 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ExecutionType;
 import org.apache.hadoop.yarn.api.records.ResourceRequest;
 import org.apache.hadoop.yarn.api.records.ResourceSizing;
@@ -59,8 +59,8 @@ import static org.apache.hadoop.yarn.api.resource.PlacementConstraints.NODE_PART
  */
 public class SingleConstraintAppPlacementAllocator<N extends SchedulerNode>
     extends AppPlacementAllocator<N> {
-  private static final Log LOG =
-      LogFactory.getLog(SingleConstraintAppPlacementAllocator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(SingleConstraintAppPlacementAllocator.class);
 
   private ReentrantReadWriteLock.ReadLock readLock;
   private ReentrantReadWriteLock.WriteLock writeLock;
@@ -363,8 +363,8 @@ public class SingleConstraintAppPlacementAllocator<N extends SchedulerNode>
 
   @Override
   public boolean canAllocate(NodeType type, SchedulerNode node) {
+    readLock.lock();
     try {
-      readLock.lock();
       return checkCardinalityAndPending(node);
     } finally {
       readLock.unlock();
@@ -411,8 +411,8 @@ public class SingleConstraintAppPlacementAllocator<N extends SchedulerNode>
 
   @Override
   public void showRequests() {
+    readLock.lock();
     try {
-      readLock.lock();
       if (schedulingRequest != null) {
         LOG.info(schedulingRequest.toString());
       }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java
index 09dd3bf3cc6..b83b2aeb67d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy;
 import java.util.*;
 import java.util.concurrent.ConcurrentSkipListSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.*;
 import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
@@ -34,7 +34,8 @@ import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
  */
 public abstract class AbstractComparatorOrderingPolicy<S extends SchedulableEntity> implements OrderingPolicy<S> {
   
-  private static final Log LOG = LogFactory.getLog(OrderingPolicy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(OrderingPolicy.class);
                                             
   protected ConcurrentSkipListSet<S> schedulableEntities;
   protected Comparator<SchedulableEntity> comparator;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/CompoundComparator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/CompoundComparator.java
index 3027ab7961a..e8b00f7132f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/CompoundComparator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/CompoundComparator.java
@@ -19,9 +19,6 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy;
 
 import java.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.*;
 
 //Some policies will use multiple comparators joined together
 class CompoundComparator implements Comparator<SchedulableEntity> {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java
index 8adb2ed1eca..84abdf4439c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AMRMTokenSecretManager.java
@@ -28,8 +28,8 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
@@ -56,8 +56,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class AMRMTokenSecretManager extends
     SecretManager<AMRMTokenIdentifier> {
 
-  private static final Log LOG = LogFactory
-    .getLog(AMRMTokenSecretManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(AMRMTokenSecretManager.class);
 
   private int serialNo = new SecureRandom().nextInt();
   private MasterKeyData nextMasterKey;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AppPriorityACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AppPriorityACLsManager.java
index c1fd0a698bc..7ff52f09829 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AppPriorityACLsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/AppPriorityACLsManager.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.security;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AccessControlList;
@@ -39,8 +39,8 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class AppPriorityACLsManager {
 
-  private static final Log LOG = LogFactory
-      .getLog(AppPriorityACLsManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(AppPriorityACLsManager.class);
 
   /*
    * An internal class to store ACLs specific to each priority. This will be
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
index de8c30b77cb..5844c8d7bf4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
@@ -44,8 +44,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
@@ -80,8 +80,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 @Unstable
 public class DelegationTokenRenewer extends AbstractService {
   
-  private static final Log LOG = 
-      LogFactory.getLog(DelegationTokenRenewer.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DelegationTokenRenewer.class);
   @VisibleForTesting
   public static final Text HDFS_DELEGATION_KIND =
       new Text("HDFS_DELEGATION_TOKEN");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java
index 956391edeea..f702c71448c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/NMTokenSecretManagerInRM.java
@@ -24,8 +24,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -43,8 +43,8 @@ import com.google.common.annotations.VisibleForTesting;
 
 public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
 
-  private static Log LOG = LogFactory
-      .getLog(NMTokenSecretManagerInRM.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(NMTokenSecretManagerInRM.class);
 
   private MasterKeyData nextMasterKey;
   private Configuration conf;
@@ -191,8 +191,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
 
   public NMToken createAndGetNMToken(String applicationSubmitter,
       ApplicationAttemptId appAttemptId, Container container) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       HashSet<NodeId> nodeSet = this.appAttemptToNodeKeyMap.get(appAttemptId);
       NMToken nmToken = null;
       if (nodeSet != null) {
@@ -213,8 +213,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
   }
 
   public void registerApplicationAttempt(ApplicationAttemptId appAttemptId) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       this.appAttemptToNodeKeyMap.put(appAttemptId, new HashSet<NodeId>());
     } finally {
       this.writeLock.unlock();
@@ -225,8 +225,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
   @VisibleForTesting
   public boolean isApplicationAttemptRegistered(
       ApplicationAttemptId appAttemptId) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       return this.appAttemptToNodeKeyMap.containsKey(appAttemptId);
     } finally {
       this.readLock.unlock();
@@ -237,8 +237,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
   @VisibleForTesting
   public boolean isApplicationAttemptNMTokenPresent(
       ApplicationAttemptId appAttemptId, NodeId nodeId) {
+    this.readLock.lock();
     try {
-      this.readLock.lock();
       HashSet<NodeId> nodes = this.appAttemptToNodeKeyMap.get(appAttemptId);
       if (nodes != null && nodes.contains(nodeId)) {
         return true;
@@ -251,8 +251,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
   }
   
   public void unregisterApplicationAttempt(ApplicationAttemptId appAttemptId) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       this.appAttemptToNodeKeyMap.remove(appAttemptId);
     } finally {
       this.writeLock.unlock();
@@ -265,8 +265,8 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
    * @param nodeId
    */
   public void removeNodeKey(NodeId nodeId) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       Iterator<HashSet<NodeId>> appNodeKeySetIterator =
           this.appAttemptToNodeKeyMap.values().iterator();
       while (appNodeKeySetIterator.hasNext()) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/QueueACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/QueueACLsManager.java
index 4c22a55b269..1caa181176e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/QueueACLsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/QueueACLsManager.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.security;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.QueueACL;
@@ -39,7 +39,8 @@ import java.util.List;
 
 public class QueueACLsManager {
 
-  private static final Log LOG = LogFactory.getLog(QueueACLsManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(QueueACLsManager.class);
 
   private ResourceScheduler scheduler;
   private boolean isACLsEnable;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java
index 945d89ec19a..3ebc395deb1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMContainerTokenSecretManager.java
@@ -23,8 +23,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -51,8 +51,8 @@ import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 public class RMContainerTokenSecretManager extends
     BaseContainerTokenSecretManager {
 
-  private static Log LOG = LogFactory
-      .getLog(RMContainerTokenSecretManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMContainerTokenSecretManager.class);
 
   private MasterKeyData nextMasterKey;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java
index 37cd7416697..d13e8a115b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -50,8 +50,8 @@ import com.google.common.annotations.VisibleForTesting;
 public class RMDelegationTokenSecretManager extends
     AbstractDelegationTokenSecretManager<RMDelegationTokenIdentifier> implements
     Recoverable {
-  private static final Log LOG = LogFactory
-      .getLog(RMDelegationTokenSecretManager.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMDelegationTokenSecretManager.class);
 
   private final ResourceManager rm;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/timelineservice/RMTimelineCollectorManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/timelineservice/RMTimelineCollectorManager.java
index c980458e854..690340c2997 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/timelineservice/RMTimelineCollectorManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/timelineservice/RMTimelineCollectorManager.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.timelineservice;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -38,8 +38,8 @@ import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public class RMTimelineCollectorManager extends TimelineCollectorManager {
-  private static final Log LOG =
-      LogFactory.getLog(RMTimelineCollectorManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMTimelineCollectorManager.class);
 
   private ResourceManager rm;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/VolumeManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/VolumeManagerImpl.java
index 839d1bc61f3..2d682c72559 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/VolumeManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/VolumeManagerImpl.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.volume.csi;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -51,7 +51,8 @@ import java.util.concurrent.TimeUnit;
 public class VolumeManagerImpl extends AbstractService
     implements VolumeManager {
 
-  private static final Log LOG = LogFactory.getLog(VolumeManagerImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(VolumeManagerImpl.class);
 
   private final VolumeStates volumeStates;
   private ScheduledExecutorService provisioningExecutor;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/lifecycle/VolumeImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/lifecycle/VolumeImpl.java
index 068e8a4fe24..186742b107f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/lifecycle/VolumeImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/volume/csi/lifecycle/VolumeImpl.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.volume.csi.lifecycle;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.CsiAdaptorProtocol;
 import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeCapability;
@@ -53,7 +53,8 @@ import static org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilit
  */
 public class VolumeImpl implements Volume {
 
-  private static final Log LOG = LogFactory.getLog(VolumeImpl.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(VolumeImpl.class);
 
   private final Lock readLock;
   private final Lock writeLock;
@@ -123,8 +124,8 @@ public class VolumeImpl implements Volume {
 
   @Override
   public VolumeState getVolumeState() {
+    readLock.lock();
     try {
-      readLock.lock();
       return stateMachine.getCurrentState();
     } finally {
       readLock.unlock();
@@ -133,8 +134,8 @@ public class VolumeImpl implements Volume {
 
   @Override
   public VolumeId getVolumeId() {
+    readLock.lock();
     try {
-      readLock.lock();
       return this.volumeId;
     } finally {
       readLock.unlock();
@@ -183,8 +184,8 @@ public class VolumeImpl implements Volume {
 
   @Override
   public void handle(VolumeEvent event) {
+    this.writeLock.lock();
     try {
-      this.writeLock.lock();
       VolumeId volumeId = event.getVolumeId();
 
       if (volumeId == null) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DeSelectFields.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DeSelectFields.java
index c991766ae6a..2023ebd7dea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DeSelectFields.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DeSelectFields.java
@@ -21,8 +21,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.webapp.BadRequestException;
 
 /**
@@ -34,8 +34,8 @@ import org.apache.hadoop.yarn.webapp.BadRequestException;
  * the return of method contains(DeSelectType)
  */
 public class DeSelectFields {
-  private static final Log LOG =
-      LogFactory.getLog(DeSelectFields.class.getName());
+  private static final Logger LOG =
+      LoggerFactory.getLogger(DeSelectFields.class.getName());
 
   private final Set<DeSelectType> types;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java
index 1993f6c0264..3107644f640 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java
@@ -18,9 +18,6 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
 import org.apache.hadoop.yarn.util.Log4jWarningErrorMetricsAppender;
 import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
@@ -29,12 +26,13 @@ import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.LI;
 import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.UL;
 import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
 
+import static org.apache.hadoop.util.GenericsUtil.isLog4jLogger;
+
 public class NavBlock extends HtmlBlock {
 
   @Override public void render(Block html) {
     boolean addErrorsAndWarningsLink = false;
-    Log log = LogFactory.getLog(NavBlock.class);
-    if (log instanceof Log4JLogger) {
+    if (isLog4jLogger(NavBlock.class)) {
       Log4jWarningErrorMetricsAppender appender =
           Log4jWarningErrorMetricsAppender.findAppender();
       if (appender != null) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppLogAggregationStatusBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppLogAggregationStatusBlock.java
index c1f2e5ed109..b822678e24c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppLogAggregationStatusBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppLogAggregationStatusBlock.java
@@ -26,8 +26,8 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI._TH;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.LogAggregationStatus;
@@ -47,8 +47,8 @@ import com.google.inject.Inject;
 
 public class RMAppLogAggregationStatusBlock extends HtmlBlock {
 
-  private static final Log LOG = LogFactory
-    .getLog(RMAppLogAggregationStatusBlock.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RMAppLogAggregationStatusBlock.class);
   private final ResourceManager rm;
   private final Configuration conf;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java
index b8d43900803..316e7ed5195 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java
@@ -22,8 +22,8 @@ import static org.apache.hadoop.yarn.util.StringHelper.pajoin;
 
 import java.net.InetSocketAddress;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.util.RMHAUtils;
@@ -40,8 +40,8 @@ import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
  */
 public class RMWebApp extends WebApp implements YarnWebParams {
 
-  private static final Log LOG =
-      LogFactory.getLog(RMWebApp.class.getName());
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMWebApp.class.getName());
   private final ResourceManager rm;
   private boolean standby = false;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppUtil.java
index 531ce975ab7..5e73a5b8a40 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppUtil.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebAppUtil.java
@@ -28,8 +28,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.http.lib.StaticUserWebFilter;
 import org.apache.hadoop.io.DataOutputBuffer;
@@ -66,7 +66,8 @@ import org.apache.hadoop.yarn.webapp.BadRequestException;
  */
 public final class RMWebAppUtil {
 
-  private static final Log LOG = LogFactory.getLog(RMWebAppUtil.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RMWebAppUtil.class);
 
   /**
    * Private constructor.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ActivitiesInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ActivitiesInfo.java
index 0de340a1ec6..e64fee4f650 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ActivitiesInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ActivitiesInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.NodeAllocation;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -40,7 +40,8 @@ public class ActivitiesInfo {
   protected String diagnostic = null;
   protected List<NodeAllocationInfo> allocations;
 
-  private static final Log LOG = LogFactory.getLog(ActivitiesInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ActivitiesInfo.class);
 
   public ActivitiesInfo() {
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppActivitiesInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppActivitiesInfo.java
index 38c45a25371..26d7e401a83 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppActivitiesInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppActivitiesInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.AppAllocation;
 import org.apache.hadoop.yarn.util.SystemClock;
@@ -42,7 +42,8 @@ public class AppActivitiesInfo {
   protected String timeStamp;
   protected List<AppAllocationInfo> allocations;
 
-  private static final Log LOG = LogFactory.getLog(AppActivitiesInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AppActivitiesInfo.class);
 
   public AppActivitiesInfo() {
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAllocationInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAllocationInfo.java
index 21d37886140..2a25ec4ff2a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAllocationInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAllocationInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.AppAllocation;
 
@@ -45,7 +45,8 @@ public class AppAllocationInfo {
   protected String timeStamp;
   protected List<ActivityNodeInfo> allocationAttempt;
 
-  private static final Log LOG = LogFactory.getLog(AppAllocationInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AppAllocationInfo.class);
 
   AppAllocationInfo() {
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeAllocationInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeAllocationInfo.java
index 1350a760261..c8f1c6599e6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeAllocationInfo.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeAllocationInfo.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.NodeAllocation;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -36,7 +36,8 @@ public class NodeAllocationInfo {
   protected String finalAllocationState;
   protected ActivityNodeInfo root = null;
 
-  private static final Log LOG = LogFactory.getLog(NodeAllocationInfo.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeAllocationInfo.class);
 
   NodeAllocationInfo() {
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ACLsTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ACLsTestBase.java
index 100eb7f21a9..ddebaaa7d15 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ACLsTestBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ACLsTestBase.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.security.PrivilegedExceptionAction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AccessControlList;
@@ -48,7 +48,8 @@ public abstract class ACLsTestBase {
   protected static final String QUEUEB = "queueB";
   protected static final String QUEUEC = "queueC";
 
-  protected static final Log LOG = LogFactory.getLog(TestApplicationACLs.class);
+  protected static final Logger LOG =
+      LoggerFactory.getLogger(TestApplicationACLs.class);
 
   protected MockRM resourceManager;
   Configuration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
index 91780098646..85d78c8f9a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java
@@ -30,8 +30,8 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
@@ -74,7 +74,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 
 @Private
 public class Application {
-  private static final Log LOG = LogFactory.getLog(Application.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(Application.class);
   
   private AtomicInteger taskCounter = new AtomicInteger(0);
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterServiceTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterServiceTestBase.java
index 7fc2a53cc19..c775bd7c382 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterServiceTestBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterServiceTestBase.java
@@ -17,8 +17,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
@@ -69,8 +69,8 @@ import static org.junit.Assert.fail;
  * Some implementors are for testing CS and FS.
  */
 public abstract class ApplicationMasterServiceTestBase {
-  private static final Log LOG = LogFactory
-      .getLog(ApplicationMasterServiceTestBase.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(ApplicationMasterServiceTestBase.class);
 
   static final int GB = 1024;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
index 04a9a759e65..3b1d01e78ac 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
@@ -54,11 +54,13 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.util.Records;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MockAM {
 
-  private static final Logger LOG = Logger.getLogger(MockAM.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(MockAM.class);
 
   private volatile int responseId = 0;
   private final ApplicationAttemptId attemptId;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
index 408cb187619..b45ce6697fd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
@@ -31,6 +31,7 @@ import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.security.Credentials;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.Token;
@@ -109,16 +110,16 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSe
 import org.apache.hadoop.yarn.util.Records;
 import org.apache.hadoop.yarn.util.YarnVersionInfo;
 import org.apache.hadoop.yarn.util.resource.ResourceUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 
 
 @SuppressWarnings("unchecked")
 public class MockRM extends ResourceManager {
 
-  static final Logger LOG = Logger.getLogger(MockRM.class);
+  static final Logger LOG = LoggerFactory.getLogger(MockRM.class);
   static final String ENABLE_WEBAPP = "mockrm.webapp.enabled";
   private static final int SECOND = 1000;
   private static final int TIMEOUT_MS_FOR_ATTEMPT = 40 * SECOND;
@@ -176,8 +177,7 @@ public class MockRM extends ResourceManager {
         setRMStateStore(mockStateStore);
       }
     }
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     disableDrainEventsImplicitly = false;
   }
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java
index 440d971f208..3e7dfcdec45 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java
@@ -39,8 +39,8 @@ import org.apache.hadoop.yarn.api.protocolrecords.ResourceLocalizationResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.RestartContainerResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.RollbackResponse;
 import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
 import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusesRequest;
@@ -76,7 +76,8 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 
 @Private
 public class NodeManager implements ContainerManagementProtocol {
-  private static final Log LOG = LogFactory.getLog(NodeManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeManager.class);
   private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
   
   final private String containerManagerAddress;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Task.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Task.java
index 31b372e1b79..5020be59cb1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Task.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Task.java
@@ -24,8 +24,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.Priority;
@@ -36,7 +36,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity
     .TestUtils;
 
 public class Task {
-  private static final Log LOG = LogFactory.getLog(Task.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(Task.class);
   
   public enum State {PENDING, ALLOCATED, RUNNING, COMPLETE};
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java
index 50e5865d3d8..fcd4ed1f444 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAMAuthorization.java
@@ -27,8 +27,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -87,7 +87,8 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TestAMAuthorization {
 
-  private static final Log LOG = LogFactory.getLog(TestAMAuthorization.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestAMAuthorization.class);
 
   private final Configuration conf;
   private MockRM rm;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
index a0fbebf4e4f..75c842e2f39 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
@@ -22,8 +22,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.io.DataOutputBuffer;
@@ -115,7 +115,8 @@ import static org.mockito.Mockito.when;
  */
 
 public class TestAppManager extends AppManagerTestBase{
-  private Log LOG = LogFactory.getLog(TestAppManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestAppManager.class);
   private static RMAppEventType appEventType = RMAppEventType.KILL;
 
   private static String USER = "user_";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java
index 53ea10dbfca..667d0893631 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationACLs.java
@@ -37,8 +37,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedule
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration;
 import org.junit.After;
 import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AccessControlList;
@@ -84,7 +84,8 @@ public class TestApplicationACLs extends ParameterizedSchedulerTestBase {
   private static final String SUPER_GROUP = "superGroup";
   private static final String UNAVAILABLE = "N/A";
 
-  private static final Log LOG = LogFactory.getLog(TestApplicationACLs.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestApplicationACLs.class);
 
   private MockRM resourceManager;
   private Configuration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java
index c12ae3385d0..373fa90325b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java
@@ -25,9 +25,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -49,24 +51,20 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 public class TestApplicationCleanup {
 
-  private static final Log LOG = LogFactory
-    .getLog(TestApplicationCleanup.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestApplicationCleanup.class);
   
   private YarnConfiguration conf;
   
   @Before
   public void setup() throws UnknownHostException {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     conf = new YarnConfiguration();
     UserGroupInformation.setConfiguration(conf);
     conf.set(YarnConfiguration.RECOVERY_ENABLED, "true");
@@ -77,8 +75,7 @@ public class TestApplicationCleanup {
   @SuppressWarnings("resource")
   @Test
   public void testAppCleanup() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM();
     rm.start();
 
@@ -156,8 +153,7 @@ public class TestApplicationCleanup {
   @Test
   public void testContainerCleanup() throws Exception {
 
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM();
     rm.start();
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java
index aa5c402fed1..55b4935ab14 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java
@@ -26,8 +26,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.DataInputByteBuffer;
 import org.apache.hadoop.io.DataOutputBuffer;
@@ -88,9 +89,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.ProxyCAManager;
 import org.apache.hadoop.yarn.server.security.AMSecretKeys;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.server.webproxy.ProxyCA;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -104,8 +102,8 @@ import static org.mockito.Mockito.when;
 
 public class TestApplicationMasterLauncher {
 
-  private static final Log LOG = LogFactory
-      .getLog(TestApplicationMasterLauncher.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestApplicationMasterLauncher.class);
 
   private static final class MyContainerManagerImpl implements
       ContainerManagementProtocol {
@@ -225,8 +223,7 @@ public class TestApplicationMasterLauncher {
 
   @Test
   public void testAMLaunchAndCleanup() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MyContainerManagerImpl containerManager = new MyContainerManagerImpl();
     MockRMWithCustomAMLauncher rm = new MockRMWithCustomAMLauncher(
         containerManager);
@@ -383,9 +380,8 @@ public class TestApplicationMasterLauncher {
   @SuppressWarnings("unused")
   @Test(timeout = 100000)
   public void testallocateBeforeAMRegistration() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
     boolean thrown = false;
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM();
     rm.start();
     MockNM nm1 = rm.registerNode("h1:1234", 5000);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterServiceInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterServiceInterceptor.java
index 66fda4521a9..7da4d979a43 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterServiceInterceptor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterServiceInterceptor.java
@@ -16,8 +16,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceContext;
 import org.apache.hadoop.yarn.ams.ApplicationMasterServiceProcessor;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
@@ -52,8 +52,8 @@ import static java.lang.Thread.sleep;
  * in the chain is also invoked.
  */
 public class TestApplicationMasterServiceInterceptor {
-  private static final Log LOG = LogFactory
-      .getLog(TestApplicationMasterServiceInterceptor.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestApplicationMasterServiceInterceptor.class);
 
   private static AtomicInteger beforeRegCount = new AtomicInteger(0);
   private static AtomicInteger afterRegCount = new AtomicInteger(0);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
index 03436dc762f..6049c11dbb3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
@@ -51,8 +51,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CyclicBarrier;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.MockApps;
@@ -186,7 +186,8 @@ import com.google.common.collect.Sets;
 
 public class TestClientRMService {
 
-  private static final Log LOG = LogFactory.getLog(TestClientRMService.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestClientRMService.class);
 
   private RecordFactory recordFactory = RecordFactoryProvider
       .getRecordFactory(null);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java
index f381a865561..d2c62f5f16e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java
@@ -44,8 +44,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.RMDelegati
 import org.junit.AfterClass;
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -84,7 +84,8 @@ import org.junit.Test;
 
 public class TestClientRMTokens {
 
-  private static final Log LOG = LogFactory.getLog(TestClientRMTokens.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestClientRMTokens.class);
   
   // Note : Any test case in ResourceManager package that creates a proxy has
   // to be run with enabling hadoop.security.token.service.use_ip. And reset
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java
index a6b30b3f6b3..a9093f99d6b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
@@ -45,9 +46,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptS
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AggregateAppResourceUsage;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
 import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerState;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -59,8 +58,7 @@ public class TestContainerResourceUsage {
 
   @Before
   public void setup() throws UnknownHostException {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     conf = new YarnConfiguration();
     UserGroupInformation.setConfiguration(conf);
     conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java
index 149ddf57371..30443d75063 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
@@ -45,8 +45,8 @@ import org.junit.Test;
 
 public class TestKillApplicationWithRMHA extends RMHATestBase{
 
-  public static final Log LOG = LogFactory
-      .getLog(TestKillApplicationWithRMHA.class);
+  public static final Logger LOG = LoggerFactory
+      .getLogger(TestKillApplicationWithRMHA.class);
 
   @Test (timeout = 20000)
   public void testKillAppWhenFailoverHappensAtNewState()
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java
index 121cacba5e7..c2b1eb45b8a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java
@@ -31,9 +31,7 @@ import org.apache.hadoop.yarn.conf.HAUtil;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemoryRMStateStore;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.ApplicationStateData;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.apache.zookeeper.ZooKeeper;
 import org.junit.After;
 import org.junit.Before;
@@ -58,8 +56,7 @@ public class TestLeaderElectorService {
   TestingCluster zkCluster;
   @Before
   public void setUp() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.INFO);
+    GenericTestUtils.setRootLogLevel(Level.INFO);
     conf = new Configuration();
     conf.setBoolean(YarnConfiguration.RM_HA_ENABLED, true);
     conf.setBoolean(YarnConfiguration.CURATOR_LEADER_ELECTOR, true);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
index 9e4512180b7..49144a3c415 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
@@ -39,8 +39,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
 import org.junit.After;
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
@@ -75,15 +76,13 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptS
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.Test;
 import org.mockito.ArgumentMatcher;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class TestRM extends ParameterizedSchedulerTestBase {
-  private static final Log LOG = LogFactory.getLog(TestRM.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestRM.class);
 
   // Milliseconds to sleep for when waiting for something to happen
   private final static int WAIT_SLEEP_MS = 100;
@@ -108,8 +107,7 @@ public class TestRM extends ParameterizedSchedulerTestBase {
 
   @Test
   public void testGetNewAppId() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM(conf);
     rm.start();
     
@@ -121,8 +119,7 @@ public class TestRM extends ParameterizedSchedulerTestBase {
   
   @Test (timeout = 30000)
   public void testAppWithNoContainers() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM(conf);
     rm.start();
     MockNM nm1 = rm.registerNode("h1:1234", 5120);
@@ -143,8 +140,7 @@ public class TestRM extends ParameterizedSchedulerTestBase {
 
   @Test (timeout = 30000)
   public void testAppOnMultiNode() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     conf.set(CapacitySchedulerConfiguration.NODE_LOCALITY_DELAY, "-1");
     MockRM rm = new MockRM(conf);
     rm.start();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
index b91d32a9f7d..1781fed69a0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ha.ClientBaseWithFixes;
 import org.apache.hadoop.ha.ServiceFailedException;
@@ -44,8 +44,8 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class TestRMEmbeddedElector extends ClientBaseWithFixes {
-  private static final Log LOG =
-      LogFactory.getLog(TestRMEmbeddedElector.class.getName());
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestRMEmbeddedElector.class.getName());
 
   private static final String RM1_NODE_ID = "rm1";
   private static final int RM1_PORT_BASE = 10000;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java
index c17dee80d37..3b3bd4b424c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java
@@ -32,8 +32,8 @@ import java.net.InetSocketAddress;
 
 import javax.ws.rs.core.MediaType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ha.HAServiceProtocol;
 import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
@@ -72,7 +72,7 @@ import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 
 public class TestRMHA {
-  private Log LOG = LogFactory.getLog(TestRMHA.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TestRMHA.class);
   private Configuration configuration;
   private MockRM rm = null;
   private MockNM nm = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHAForNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHAForNodeLabels.java
index 25d9c56835a..30f52acfc8c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHAForNodeLabels.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHAForNodeLabels.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.NodeLabel;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -36,8 +36,8 @@ import org.junit.Test;
 import com.google.common.collect.ImmutableSet;
 
 public class TestRMHAForNodeLabels extends RMHATestBase {
-  public static final Log LOG = LogFactory
-      .getLog(TestSubmitApplicationWithRMHA.class);
+  public static final Logger LOG = LoggerFactory
+      .getLogger(TestRMHAForNodeLabels.class);
 
   @Before
   @Override
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
index 97883da8093..f09850afaf9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
@@ -43,8 +43,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.io.DataOutputBuffer;
@@ -126,9 +127,6 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineW
 import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -140,7 +138,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 
 public class TestRMRestart extends ParameterizedSchedulerTestBase {
-  private static final Log LOG = LogFactory.getLog(TestRMRestart.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestRMRestart.class);
   private final static File TEMP_DIR = new File(System.getProperty(
     "test.build.data", "/tmp"), "decommision");
   private File hostFile = new File(TEMP_DIR + File.separator + "hostFile.txt");
@@ -157,8 +156,7 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase {
   @Before
   public void setup() throws IOException {
     conf = getConf();
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     UserGroupInformation.setConfiguration(conf);
     conf.setBoolean(YarnConfiguration.RECOVERY_ENABLED, true);
     conf.setBoolean(YarnConfiguration.RM_WORK_PRESERVING_RECOVERY_ENABLED, false);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java
index a66c583ccf7..6282af497bc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java
@@ -25,8 +25,8 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.http.lib.StaticUserWebFilter;
 import org.apache.hadoop.net.NetworkTopology;
@@ -54,7 +54,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class TestResourceManager {
-  private static final Log LOG = LogFactory.getLog(TestResourceManager.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestResourceManager.class);
   
   private ResourceManager resourceManager = null;
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManagerMXBean.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManagerMXBean.java
index 7b6fa78134d..0e70b5f1c38 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManagerMXBean.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManagerMXBean.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -33,8 +33,8 @@ import java.lang.management.ManagementFactory;
  * Class for testing {@link ResourceManagerMXBean} implementation.
  */
 public class TestResourceManagerMXBean {
-  public static final Log LOG = LogFactory.getLog(
-          TestResourceManagerMXBean.class);
+  public static final Logger LOG = LoggerFactory.getLogger(
+      TestResourceManagerMXBean.class);
 
   @Test
   public void testResourceManagerMXBean() throws Exception {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java
index fac0b9662ef..c63df36cb0c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java
@@ -21,11 +21,13 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -36,20 +38,16 @@ import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.Test;
 
 public class TestSignalContainer {
 
-  private static final Log LOG = LogFactory
-    .getLog(TestSignalContainer.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestSignalContainer.class);
 
   @Test
   public void testSignalRequestDeliveryToNM() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM();
     FairScheduler fs = null;
     if (rm.getResourceScheduler().getClass() == FairScheduler.class) {
@@ -117,4 +115,4 @@ public class TestSignalContainer {
 
     rm.stop();
   }
-}
\ No newline at end of file
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
index 4658d6030e4..c4fa74d093b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
@@ -34,8 +34,8 @@ import org.junit.Test;
 
 public class TestSubmitApplicationWithRMHA extends RMHATestBase{
 
-  public static final Log LOG = LogFactory
-      .getLog(TestSubmitApplicationWithRMHA.class);
+  public static final Logger LOG = LoggerFactory
+      .getLogger(TestSubmitApplicationWithRMHA.class);
 
   @Test
   public void
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
index f747c4b8f14..fa5f135153b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
@@ -84,9 +84,7 @@ import org.apache.hadoop.yarn.util.Records;
 import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.Resources;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -127,8 +125,7 @@ public class TestWorkPreservingRMRestart extends ParameterizedSchedulerTestBase
 
   @Before
   public void setup() throws UnknownHostException {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     conf = getConf();
     UserGroupInformation.setConfiguration(conf);
     conf.set(YarnConfiguration.RECOVERY_ENABLED, "true");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingUnmanagedAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingUnmanagedAM.java
index 80f7319bdae..c8cbfb7a48c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingUnmanagedAM.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingUnmanagedAM.java
@@ -25,6 +25,7 @@ import java.util.List;
 
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -33,9 +34,7 @@ import org.apache.hadoop.yarn.api.records.ResourceRequest;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.InvalidApplicationMasterRequestException;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,8 +53,7 @@ public class TestWorkPreservingUnmanagedAM
 
   @Before
   public void setup() {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     conf = getConf();
     UserGroupInformation.setConfiguration(conf);
     DefaultMetricsSystem.setMiniClusterMode(true);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java
index ad39099999d..06e20098ed3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.applicationsmanager;
 
+/*
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -25,8 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -55,10 +56,12 @@ import org.apache.hadoop.yarn.util.resource.Resources;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+*/
 
 /* a test case that tests the launch failure of a AM */
 public class TestAMLaunchFailure {
-//  private static final Log LOG = LogFactory.getLog(TestAMLaunchFailure.class);
+//  private static final Logger LOG =
+//      LoggerFactory.getLogger(TestAMLaunchFailure.class);
 //  private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
 //  ApplicationsManagerImpl asmImpl;
 //  YarnScheduler scheduler = new DummyYarnScheduler();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestASMStateMachine.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestASMStateMachine.java
index 5061103f0b2..ef3b65cc1a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestASMStateMachine.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestASMStateMachine.java
@@ -18,12 +18,13 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.applicationsmanager;
 
+/*
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
@@ -39,9 +40,11 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessM
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+*/
 
 public class TestASMStateMachine {
-//  private static final Log LOG = LogFactory.getLog(TestASMStateMachine.class);
+//  private static final Logger LOG =
+//      LoggerFactory.getLogger(TestASMStateMachine.class);
 //  private static RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
 //  RMContext context = new RMContextImpl(new MemStore());
 //  EventHandler handler;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestApplicationMasterExpiry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestApplicationMasterExpiry.java
index 055d907bfc7..beaec79fa38 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestApplicationMasterExpiry.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestApplicationMasterExpiry.java
@@ -18,12 +18,13 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.applicationsmanager;
 
+/*
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;
@@ -39,13 +40,15 @@ import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEventT
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor;
 import org.junit.Before;
 import org.junit.Test;
+*/
 
 /**
  * A test case that tests the expiry of the application master.
  * More tests can be added to this.
  */
 public class TestApplicationMasterExpiry {
-//  private static final Log LOG = LogFactory.getLog(TestApplicationMasterExpiry.class);
+//  private static final Logger LOG =
+//      LoggerFactory.getLogger(TestApplicationMasterExpiry.class);
 //  private static RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
 //
 //  private final RMContext context = new RMContextImpl(new MemStore());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
index f2d82e9379e..64c90637f2f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java
@@ -115,6 +115,7 @@ public class TestSystemMetricsPublisher {
       ApplicationId appId = ApplicationId.newInstance(0, i);
       RMApp app = createRMApp(appId);
       metricsPublisher.appCreated(app, app.getStartTime());
+      metricsPublisher.appLaunched(app, app.getLaunchTime());
       if (i == 1) {
         when(app.getQueue()).thenReturn("new test queue");
         ApplicationSubmissionContext asc = mock(
@@ -150,7 +151,7 @@ public class TestSystemMetricsPublisher {
                 ApplicationMetricsConstants.ENTITY_TYPE,
                 EnumSet.allOf(Field.class));
         // ensure Five events are both published before leaving the loop
-      } while (entity == null || entity.getEvents().size() < 5);
+      } while (entity == null || entity.getEvents().size() < 6);
       // verify all the fields
       Assert.assertEquals(ApplicationMetricsConstants.ENTITY_TYPE,
           entity.getEntityType());
@@ -240,6 +241,7 @@ public class TestSystemMetricsPublisher {
       Assert.assertEquals("context", entity.getOtherInfo()
           .get(ApplicationMetricsConstants.YARN_APP_CALLER_CONTEXT));
       boolean hasCreatedEvent = false;
+      boolean hasLaunchedEvent = false;
       boolean hasUpdatedEvent = false;
       boolean hasFinishedEvent = false;
       boolean hasACLsUpdatedEvent = false;
@@ -249,6 +251,10 @@ public class TestSystemMetricsPublisher {
             ApplicationMetricsConstants.CREATED_EVENT_TYPE)) {
           hasCreatedEvent = true;
           Assert.assertEquals(app.getStartTime(), event.getTimestamp());
+        } else if (event.getEventType().equals(
+            ApplicationMetricsConstants.LAUNCHED_EVENT_TYPE)) {
+          hasLaunchedEvent = true;
+          Assert.assertEquals(app.getLaunchTime(), event.getTimestamp());
         } else if (event.getEventType().equals(
             ApplicationMetricsConstants.FINISHED_EVENT_TYPE)) {
           hasFinishedEvent = true;
@@ -292,6 +298,7 @@ public class TestSystemMetricsPublisher {
       }
       // Do assertTrue verification separately for easier debug
       Assert.assertTrue(hasCreatedEvent);
+      Assert.assertTrue(hasLaunchedEvent);
       Assert.assertTrue(hasFinishedEvent);
       Assert.assertTrue(hasACLsUpdatedEvent);
       Assert.assertTrue(hasUpdatedEvent);
@@ -499,6 +506,7 @@ public class TestSystemMetricsPublisher {
     when(app.getQueue()).thenReturn("test queue");
     when(app.getSubmitTime()).thenReturn(Integer.MAX_VALUE + 1L);
     when(app.getStartTime()).thenReturn(Integer.MAX_VALUE + 2L);
+    when(app.getLaunchTime()).thenReturn(Integer.MAX_VALUE + 2L);
     when(app.getFinishTime()).thenReturn(Integer.MAX_VALUE + 3L);
     when(app.getDiagnostics()).thenReturn(
         new StringBuilder("test diagnostics info"));
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java
index ad2432121c7..4a762fa9b0f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicyMockFramework.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -90,8 +90,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 public class ProportionalCapacityPreemptionPolicyMockFramework {
-  static final Log LOG =
-      LogFactory.getLog(TestProportionalCapacityPreemptionPolicyForNodePartitions.class);
+  static final Logger LOG = LoggerFactory.getLogger(
+      TestProportionalCapacityPreemptionPolicyForNodePartitions.class);
   final String ROOT = CapacitySchedulerConfiguration.ROOT;
 
   Map<String, CSQueue> nameToCSQueues = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestFairQueuePlacementUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestFairQueuePlacementUtils.java
new file mode 100644
index 00000000000..506746add80
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestFairQueuePlacementUtils.java
@@ -0,0 +1,137 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.junit.Test;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT_REPLACEMENT;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.ROOT_QUEUE;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.assureRoot;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.cleanName;
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.isValidQueueName;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests of the utility methods from {@link FairQueuePlacementUtils}.
+ */
+public class TestFairQueuePlacementUtils {
+
+  /**
+   * Test name trimming and dot replacement in names.
+   */
+  @Test
+  public void testCleanName() {
+    // permutations of dot placements
+    final String clean = "clean";
+    final String dotted = "not.clean";
+    final String multiDot = "more.un.clean";
+    final String seqDot = "not..clean";
+    final String unTrimmed = " .invalid. "; // not really a valid queue
+
+    String cleaned = cleanName(clean);
+    assertEquals("Name was changed and it should not", clean, cleaned);
+    cleaned = cleanName(dotted);
+    assertFalse("Cleaned name contains dots and it should not",
+        cleaned.contains(DOT));
+    cleaned = cleanName(multiDot);
+    assertFalse("Cleaned name contains dots and it should not",
+        cleaned.contains(DOT));
+    assertNotEquals("Multi dot failed: wrong replacements found",
+        cleaned.indexOf(DOT_REPLACEMENT),
+        cleaned.lastIndexOf(DOT_REPLACEMENT));
+    cleaned = cleanName(seqDot);
+    assertFalse("Cleaned name contains dots and it should not",
+        cleaned.contains(DOT));
+    assertNotEquals("Sequential dot failed: wrong replacements found",
+        cleaned.indexOf(DOT_REPLACEMENT),
+        cleaned.lastIndexOf(DOT_REPLACEMENT));
+    cleaned = cleanName(unTrimmed);
+    assertTrue("Trimming start failed: space not removed or dot not replaced",
+        cleaned.startsWith(DOT_REPLACEMENT));
+    assertTrue("Trimming end failed: space not removed or dot not replaced",
+        cleaned.endsWith(DOT_REPLACEMENT));
+  }
+
+  @Test
+  public void testAssureRoot() {
+    // permutations of rooted queue names
+    final String queueName = "base";
+    final String rootOnly = "root";
+    final String rootNoDot = "rootbase";
+    final String alreadyRoot = "root.base";
+
+    String rooted = assureRoot(queueName);
+    assertTrue("Queue should have root prefix (base)",
+        rooted.startsWith(ROOT_QUEUE + DOT));
+    rooted = assureRoot(rootOnly);
+    assertEquals("'root' queue should not have root prefix (root)",
+        rootOnly, rooted);
+    rooted = assureRoot(rootNoDot);
+    assertTrue("Queue should have root prefix (rootbase)",
+        rooted.startsWith(ROOT_QUEUE + DOT));
+    assertEquals("'root' queue base was replaced and not prefixed", 5,
+        rooted.lastIndexOf(ROOT_QUEUE));
+    rooted = assureRoot(alreadyRoot);
+    assertEquals("Root prefixed queue changed and it should not (root.base)",
+        rooted, alreadyRoot);
+    assertNull("Null queue did not return null queue",
+        assureRoot(null));
+    assertEquals("Empty queue did not return empty name", "",
+        assureRoot(""));
+  }
+
+  @Test
+  public void testIsValidQueueName() {
+    // permutations of valid/invalid names
+    final String valid = "valid";
+    final String validRooted = "root.valid";
+    final String rootOnly = "root";
+    final String startDot = ".invalid";
+    final String endDot = "invalid.";
+    final String startSpace = " invalid";
+    final String endSpace = "invalid ";
+    final String unicodeSpace = "\u00A0invalid";
+
+    assertFalse("'null' queue was not marked as invalid",
+        isValidQueueName(null));
+    assertTrue("empty queue was not tagged valid", isValidQueueName(""));
+    assertTrue("Simple queue name was not tagged valid (valid)",
+        isValidQueueName(valid));
+    assertTrue("Root only queue was not tagged valid (root)",
+        isValidQueueName(rootOnly));
+    assertTrue("Root prefixed queue was not tagged valid (root.valid)",
+        isValidQueueName(validRooted));
+    assertFalse("Queue starting with dot was not tagged invalid (.invalid)",
+        isValidQueueName(startDot));
+    assertFalse("Queue ending with dot was not tagged invalid (invalid.)",
+        isValidQueueName(endDot));
+    assertFalse("Queue starting with space was not tagged invalid ( invalid)",
+        isValidQueueName(startSpace));
+    assertFalse("Queue ending with space was not tagged invalid (invalid )",
+        isValidQueueName(endSpace));
+    // just one for sanity check extensive tests are in the scheduler utils
+    assertFalse("Queue with unicode space was not tagged as invalid (unicode)",
+        isValidQueueName(unicodeSpace));
+  }
+}
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementFactory.java
new file mode 100644
index 00000000000..f4d17330089
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementFactory.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+/**
+ * Test for the {@link PlacementFactory}.
+ */
+public class TestPlacementFactory {
+
+  /**
+   * Check that non existing class throws exception.
+   *
+   * @throws ClassNotFoundException
+   */
+  @Test(expected = ClassNotFoundException.class)
+  public void testGetNonExistRuleText() throws ClassNotFoundException {
+    final String nonExist = "my.placement.Rule";
+    PlacementFactory.getPlacementRule(nonExist, null);
+  }
+
+  /**
+   * Check existing class using the class name.
+   * Relies on the {@link DefaultPlacementRule} of the FS.
+   */
+  @Test
+  public void testGetExistRuleText() {
+    final String exists = DefaultPlacementRule.class.getCanonicalName();
+    PlacementRule rule = null;
+    try {
+      rule = PlacementFactory.getPlacementRule(exists, null);
+    } catch (ClassNotFoundException cnfe) {
+      fail("Class should have been found");
+    }
+    assertNotNull("Rule object is null", rule);
+    assertEquals("Names not equal", rule.getName(), exists);
+  }
+
+  /**
+   * Existing class using the class reference.
+   * Relies on the {@link DefaultPlacementRule} of the FS.
+   */
+  @Test
+  public void testGetRuleClass() {
+    PlacementRule rule = PlacementFactory.getPlacementRule(
+        DefaultPlacementRule.class, null);
+    assertNotNull("Rule object is null", rule);
+    // Should take anything as the second object: ignores unknown types in the
+    // default implementation.
+    rule = PlacementFactory.getPlacementRule(
+        DefaultPlacementRule.class, "");
+    assertNotNull("Rule object is null", rule);
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementRuleFS.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementRuleFS.java
new file mode 100644
index 00000000000..741304eafbe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementRuleFS.java
@@ -0,0 +1,212 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.placement;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueueManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.hadoop.yarn.server.resourcemanager.placement.PlacementFactory.getPlacementRule;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Simple tests for FS specific parts of the PlacementRule.
+ */
+public class TestPlacementRuleFS {
+
+  // List of rules that are configurable (reject rule is not!)
+  private static final List<Class <? extends PlacementRule>> CONFIG_RULES =
+      new ArrayList<Class <? extends PlacementRule>>() {
+    {
+      add(DefaultPlacementRule.class);
+      add(PrimaryGroupPlacementRule.class);
+      add(SecondaryGroupExistingPlacementRule.class);
+      add(SpecifiedPlacementRule.class);
+      add(UserPlacementRule.class);
+    }
+  };
+
+  // List of rules that are not configurable
+  private static final List<Class <? extends PlacementRule>> NO_CONFIG_RULES =
+      new ArrayList<Class <? extends PlacementRule>>() {
+    {
+      add(RejectPlacementRule.class);
+    }
+  };
+
+  private final static FairSchedulerConfiguration CONF =
+      new FairSchedulerConfiguration();
+  private FairScheduler scheduler;
+  private QueueManager queueManager;
+
+
+  @Before
+  public void initTest() {
+    scheduler = mock(FairScheduler.class);
+    // needed for all rules that rely on group info
+    when(scheduler.getConfig()).thenReturn(CONF);
+    // needed by all rules
+    queueManager = new QueueManager(scheduler);
+    when(scheduler.getQueueManager()).thenReturn(queueManager);
+  }
+
+  @After
+  public void cleanTest() {
+    queueManager = null;
+    scheduler = null;
+  }
+
+  /**
+   * Check the create and setting the config on the rule.
+   * This walks over all known rules and check the behaviour:
+   * - no config (null object)
+   * - unknown object type
+   * - boolean object
+   * - xml config ({@link Element})
+   * - calling initialize on the rule
+   */
+  @Test
+  public void testRuleSetups() {
+    // test for config(s) and init
+    for (Class <? extends PlacementRule> ruleClass: CONFIG_RULES) {
+      ruleCreateNoConfig(ruleClass);
+      ruleCreateWrongObject(ruleClass);
+      ruleCreateBoolean(ruleClass);
+      ruleCreateElement(ruleClass);
+      ruleInit(ruleClass);
+    }
+  }
+
+  /**
+   * Check the init of rules that do not use a config.
+   */
+  @Test
+  public void testRuleInitOnly() {
+    // test for init
+    for (Class <? extends PlacementRule> ruleClass: NO_CONFIG_RULES) {
+      ruleInit(ruleClass);
+    }
+  }
+
+  private void ruleCreateNoConfig(Class <? extends PlacementRule> ruleClass) {
+    PlacementRule rule = getPlacementRule(ruleClass, null);
+    String name = ruleClass.getName();
+    assertNotNull("Rule object should not be null for " + name, rule);
+  }
+
+  private void ruleCreateWrongObject(
+      Class <? extends PlacementRule> ruleClass) {
+    PlacementRule rule = getPlacementRule(ruleClass, "a string object");
+    String name = ruleClass.getName();
+    assertNotNull("Rule object should not be null for " + name, rule);
+  }
+
+  private void ruleCreateBoolean(Class <? extends PlacementRule> ruleClass) {
+    PlacementRule rule = getPlacementRule(ruleClass, true);
+    String name = ruleClass.getName();
+    assertNotNull("Rule object should not be null for " + name, rule);
+    assertTrue("Create flag was not set to true on " + name,
+        getCreateFlag(rule));
+    rule = getPlacementRule(ruleClass, false);
+    assertNotNull("Rule object should not be null for " + name, rule);
+    assertFalse("Create flag was not set to false on " + name,
+        getCreateFlag(rule));
+  }
+
+  private void ruleCreateElement(Class <? extends PlacementRule> ruleClass) {
+    String str = "<rule name='not used' create=\"true\" />";
+    Element conf = createConf(str);
+    PlacementRule rule = getPlacementRule(ruleClass, conf);
+    String name = ruleClass.getName();
+    assertNotNull("Rule object should not be null for " + name, rule);
+    assertTrue("Create flag was not set to true on " + name,
+        getCreateFlag(rule));
+    str = "<rule name='not used' create=\"false\" />";
+    conf = createConf(str);
+    rule = getPlacementRule(ruleClass, conf);
+    assertNotNull("Rule object should not be null for " + name, rule);
+    assertFalse("Create flag was not set to false on " + name,
+        getCreateFlag(rule));
+  }
+
+  private void ruleInit(Class <? extends PlacementRule> ruleClass) {
+    PlacementRule rule = getPlacementRule(ruleClass, null);
+    String name = ruleClass.getName();
+    assertNotNull("Rule object should not be null for " + name, rule);
+    try {
+      rule.initialize(scheduler);
+    } catch (IOException ioe) {
+      fail("Unexpected exception on initialize of rule " + name);
+    }
+    // now set the parent rule: use the same rule as a child.
+    // always throws: either because parentRule is not allowed or because it
+    // is the same class as the child rule.
+    ((FSPlacementRule)rule).setParentRule(rule);
+    boolean exceptionThrown = false;
+    try {
+      rule.initialize(scheduler);
+    } catch (IOException ioe) {
+      exceptionThrown = true;
+    }
+    assertTrue("Initialize with parent rule should have thrown exception " +
+            name, exceptionThrown);
+  }
+
+  private Element createConf(String str) {
+    // Create a simple rule element to use in the rule create
+    DocumentBuilderFactory docBuilderFactory =
+        DocumentBuilderFactory.newInstance();
+    docBuilderFactory.setIgnoringComments(true);
+    Document doc = null;
+    try {
+      DocumentBuilder builder = docBuilderFactory.newDocumentBuilder();
+      doc = builder.parse(IOUtils.toInputStream(str,
+          Charset.defaultCharset()));
+    } catch (Exception ex) {
+      fail("Element creation failed, failing test");
+    }
+    return doc.getDocumentElement();
+  }
+
+  private boolean getCreateFlag(PlacementRule rule) {
+    if (rule instanceof FSPlacementRule) {
+      return ((FSPlacementRule)rule).createQueue;
+    }
+    fail("Rule is not a FSPlacementRule");
+    return false;
+  }
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java
index cd44dda844d..9f8732acbde 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java
@@ -36,8 +36,8 @@ import java.util.Map;
 
 import javax.crypto.SecretKey;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.ipc.CallerContext;
@@ -91,7 +91,8 @@ import org.junit.Assert;
 
 public class RMStateStoreTestBase {
 
-  public static final Log LOG = LogFactory.getLog(RMStateStoreTestBase.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(RMStateStoreTestBase.class);
 
   protected final long epoch = 10L;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
index 764424de797..cd2a0fa2086 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
@@ -26,8 +26,8 @@ import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
@@ -54,7 +54,8 @@ import org.junit.Test;
 
 public class TestFSRMStateStore extends RMStateStoreTestBase {
 
-  public static final Log LOG = LogFactory.getLog(TestFSRMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(TestFSRMStateStore.class);
 
   private TestFSRMStateStoreTester fsTester;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java
index ce9e68d9c5d..23c2b9a4ff2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStore.java
@@ -22,8 +22,8 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryNTimes;
 import org.apache.curator.test.TestingServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.ha.HAServiceProtocol;
@@ -98,7 +98,8 @@ import javax.crypto.SecretKey;
 
 public class TestZKRMStateStore extends RMStateStoreTestBase {
 
-  public static final Log LOG = LogFactory.getLog(TestZKRMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(TestZKRMStateStore.class);
   private static final int ZK_TIMEOUT_MS = 1000;
   private TestingServer curatorTestingServer;
   private CuratorFramework curatorFramework;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java
index bd25defc223..893d1ca627a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java
@@ -41,8 +41,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.records.Applicatio
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.security.AMRMTokenSecretManager;
 import org.apache.hadoop.yarn.server.resourcemanager.security.ClientToAMTokenSecretManagerInRM;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.junit.Before;
@@ -54,7 +54,8 @@ import static org.mockito.Mockito.when;
 
 public class TestZKRMStateStorePerf extends RMStateStoreTestBase
     implements Tool {
-  public static final Log LOG = LogFactory.getLog(TestZKRMStateStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(TestZKRMStateStore.class);
 
   final String version = "0.1";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStoreZKClientConnections.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStoreZKClientConnections.java
index cb4e521516f..752df13ccca 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStoreZKClientConnections.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStoreZKClientConnections.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.recovery;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.curator.test.TestingServer;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
@@ -41,8 +41,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class TestZKRMStateStoreZKClientConnections {
-  private Log LOG =
-      LogFactory.getLog(TestZKRMStateStoreZKClientConnections.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestZKRMStateStoreZKClientConnections.class);
 
   private static final int ZK_TIMEOUT_MS = 1000;
   private static final String DIGEST_USER_PASS="test-user:test-password";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/TestReservationInputValidator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/TestReservationInputValidator.java
index 027b807466f..fd1da210ae5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/TestReservationInputValidator.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/TestReservationInputValidator.java
@@ -26,8 +26,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
@@ -56,8 +56,8 @@ import org.junit.Test;
 
 public class TestReservationInputValidator {
 
-  private static final Log LOG = LogFactory
-      .getLog(TestReservationInputValidator.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestReservationInputValidator.class);
 
   private static final String PLAN_NAME = "test-reservation";
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java
index c837450f021..f69faf4ea55 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.resourcetracker;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -49,7 +49,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class TestNMExpiry {
-  private static final Log LOG = LogFactory.getLog(TestNMExpiry.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestNMExpiry.class);
   private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
   
   ResourceTrackerService resourceTrackerService;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
index e1d87163b26..26499a717f1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
@@ -32,6 +32,7 @@ import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
 import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -59,9 +60,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Capacity
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
 import org.apache.hadoop.yarn.util.Times;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -106,8 +105,7 @@ public class TestApplicationLifetimeMonitor {
     // Always run for CS, since other scheduler do not support this.
     conf.setClass(YarnConfiguration.RM_SCHEDULER,
         scheduler, ResourceScheduler.class);
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     UserGroupInformation.setConfiguration(conf);
     conf.setLong(YarnConfiguration.RM_APPLICATION_MONITOR_INTERVAL_MS,
         3000L);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestNodesListManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestNodesListManager.java
index 43674e869bc..9f0fc8ed849 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestNodesListManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestNodesListManager.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy;
 
 import java.util.ArrayList;
 
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerState;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -44,9 +45,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 import org.apache.hadoop.yarn.util.ControlledClock;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.ArgumentMatcher;
@@ -57,8 +56,7 @@ public class TestNodesListManager {
 
   @Test(timeout = 300000)
   public void testNodeUsableEvent() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     final Dispatcher dispatcher = getDispatcher();
     YarnConfiguration conf = new YarnConfiguration();
     MockRM rm = new MockRM(conf) {
@@ -134,8 +132,7 @@ public class TestNodesListManager {
 
   @Test
   public void testCachedResolver() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     ControlledClock clock = new ControlledClock();
     clock.setTime(0);
     final int CACHE_EXPIRY_INTERVAL_SECS = 30;
@@ -171,8 +168,7 @@ public class TestNodesListManager {
 
   @Test
   public void testDefaultResolver() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
 
     YarnConfiguration conf = new YarnConfiguration();
 
@@ -187,8 +183,7 @@ public class TestNodesListManager {
 
   @Test
   public void testCachedResolverWithEvent() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
 
     YarnConfiguration conf = new YarnConfiguration();
     conf.setInt(YarnConfiguration.RM_NODE_IP_CACHE_EXPIRY_INTERVAL_SECS, 30);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
index 62a6706e946..dc189c1bea8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.rmapp;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileContext;
 import org.apache.hadoop.fs.Path;
@@ -120,7 +120,8 @@ import static org.mockito.Mockito.verify;
 
 @RunWith(value = Parameterized.class)
 public class TestRMAppTransitions {
-  static final Log LOG = LogFactory.getLog(TestRMAppTransitions.class);
+  static final Logger LOG =
+      LoggerFactory.getLogger(TestRMAppTransitions.class);
 
   private boolean isSecurityEnabled;
   private Configuration conf;
@@ -722,7 +723,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
     assertAppFinalStateNotSaved(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -741,7 +742,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertFailed(application, rejectedText);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
 
@@ -759,7 +760,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertFailed(application, rejectedText);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     verifyRMAppFieldsForFinalTransitions(application);
     rmContext.getStateStore().removeApplication(application);
   }
@@ -781,7 +782,7 @@ public class TestRMAppTransitions {
     rmDispatcher.await();
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -800,7 +801,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertFailed(application, rejectedText);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
 
@@ -817,7 +818,7 @@ public class TestRMAppTransitions {
     assertFailed(application, rejectedText);
     verify(store, times(0)).updateApplicationState(
         any(ApplicationStateData.class));
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     assertTimesAtFinish(application);
   }
 
@@ -835,7 +836,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertFailed(application, rejectedText);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
 
@@ -857,7 +858,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -894,7 +895,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertFailed(application, ".*" + message + ".*Failing the application.*");
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
   }
 
   @Test
@@ -921,7 +922,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -945,7 +946,7 @@ public class TestRMAppTransitions {
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
   }
 
@@ -969,7 +970,7 @@ public class TestRMAppTransitions {
     sendAttemptUpdateSavedEvent(application);
     sendAppUpdateSavedEvent(application);
     assertKilled(application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.KILLED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -1028,7 +1029,7 @@ public class TestRMAppTransitions {
     rmDispatcher.await();
     assertFailed(application, ".*Failing the application.*");
     assertAppFinalStateSaved(application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
 
@@ -1090,9 +1091,7 @@ public class TestRMAppTransitions {
     StringBuilder diag = application.getDiagnostics();
     Assert.assertEquals("application diagnostics is not correct",
         "", diag.toString());
-    // finished without a proper final state is the same as failed
-    verifyApplicationFinished(RMAppState.FINISHED,
-        FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FINISHED);
     verifyAppRemovedSchedulerEvent(application, RMAppState.FINISHED);
     verifyRMAppFieldsForFinalTransitions(application);
   }
@@ -1120,7 +1119,7 @@ public class TestRMAppTransitions {
     rmDispatcher.await();
     assertTimesAtFinish(application);
     assertAppState(RMAppState.FAILED, application);
-    verifyApplicationFinished(RMAppState.FAILED, FinalApplicationStatus.FAILED);
+    verifyApplicationFinished(RMAppState.FAILED);
 
     assertTimesAtFinish(application);
     assertAppState(RMAppState.FAILED, application);
@@ -1175,7 +1174,7 @@ public class TestRMAppTransitions {
     rmDispatcher.await();
     assertTimesAtFinish(application);
     assertAppState(RMAppState.KILLED, application);
-    verifyApplicationFinished(RMAppState.KILLED, FinalApplicationStatus.KILLED);
+    verifyApplicationFinished(RMAppState.KILLED);
 
     assertTimesAtFinish(application);
     assertAppState(RMAppState.KILLED, application);
@@ -1311,20 +1310,15 @@ public class TestRMAppTransitions {
         rmAppManagerEvent.getApplicationId().getId());
   }
 
-  private void verifyApplicationFinished(RMAppState state,
-      FinalApplicationStatus finalAppStatus) {
+  private void verifyApplicationFinished(RMAppState state) {
     ArgumentCaptor<RMAppState> finalState =
         ArgumentCaptor.forClass(RMAppState.class);
     verify(writer).applicationFinished(any(RMApp.class), finalState.capture());
     Assert.assertEquals(state, finalState.getValue());
     finalState = ArgumentCaptor.forClass(RMAppState.class);
-    ArgumentCaptor<RMApp> app =
-        ArgumentCaptor.forClass(RMApp.class);
-    verify(publisher).appFinished(app.capture(), finalState.capture(),
+    verify(publisher).appFinished(any(RMApp.class), finalState.capture(),
         anyLong());
     Assert.assertEquals(state, finalState.getValue());
-    Assert.assertEquals(finalAppStatus,
-        app.getValue().getFinalApplicationStatus());
   }
   
   private void verifyAppRemovedSchedulerEvent(RMApp app,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
index 613bd92ca81..e2f80cafd40 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
@@ -43,8 +43,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -128,8 +128,8 @@ import org.mockito.stubbing.Answer;
 @RunWith(value = Parameterized.class)
 public class TestRMAppAttemptTransitions {
 
-  private static final Log LOG = 
-      LogFactory.getLog(TestRMAppAttemptTransitions.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestRMAppAttemptTransitions.class);
   
   private static final String EMPTY_DIAGNOSTICS = "";
   private static final String FAILED_DIAGNOSTICS = "Attempt failed by user.";
@@ -436,8 +436,7 @@ public class TestRMAppAttemptTransitions {
     assertEquals(amContainer, applicationAttempt.getMasterContainer());
     assertEquals(0.0, (double)applicationAttempt.getProgress(), 0.0001);
     assertEquals(0, application.getRanNodes().size());
-    assertEquals(FinalApplicationStatus.KILLED,
-        applicationAttempt.getFinalApplicationStatus());
+    assertNull(applicationAttempt.getFinalApplicationStatus());
     verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
     verifyAttemptFinalStateSaved();
     assertFalse(transferStateFromPreviousAttempt);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestResourceUsage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestResourceUsage.java
index 5c9e320a076..a2bd9e520ee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestResourceUsage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestResourceUsage.java
@@ -22,8 +22,8 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,7 +32,8 @@ import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class TestResourceUsage {
-  private static final Log LOG = LogFactory.getLog(TestResourceUsage.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestResourceUsage.class);
   private String suffix;
 
   @Parameterized.Parameters
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java
index 0c0dcb70ac5..f25df07ee80 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java
@@ -42,8 +42,8 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.Credentials;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -108,7 +108,8 @@ import org.mockito.Mockito;
 
 public class TestSchedulerUtils {
 
-  private static final Log LOG = LogFactory.getLog(TestSchedulerUtils.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestSchedulerUtils.class);
   private static Resource configuredMaxAllocation;
 
   private RMContext rmContext = getMockRMContext();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
index 36d8e7e7852..69581820284 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationLimits.java
@@ -36,8 +36,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -83,7 +83,8 @@ import com.google.common.collect.Sets;
 
 public class TestApplicationLimits {
   
-  private static final Log LOG = LogFactory.getLog(TestApplicationLimits.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestApplicationLimits.class);
   final static int GB = 1024;
 
   LeafQueue queue;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
index aac7f15a5a5..5cb49a4e346 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
@@ -45,8 +45,8 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 
 import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.net.NetworkTopology;
@@ -180,7 +180,8 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 public class TestCapacityScheduler extends CapacitySchedulerTestBase {
-  private static final Log LOG = LogFactory.getLog(TestCapacityScheduler.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestCapacityScheduler.class);
   private final static ContainerUpdates NULL_UPDATE_REQUESTS =
       new ContainerUpdates();
   private ResourceManager resourceManager = null;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java
index f313d70191b..c64582ef21f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoCreatedQueueBase.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import org.apache.commons.lang3.RandomUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.security.GroupMappingServiceProvider;
 import org.apache.hadoop.security.ShellBasedUnixGroupsMapping;
@@ -101,7 +101,7 @@ import static org.junit.Assert.fail;
 
 public class TestCapacitySchedulerAutoCreatedQueueBase {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       TestCapacitySchedulerAutoCreatedQueueBase.class);
   public static final int GB = 1024;
   public static final ContainerUpdates NULL_UPDATE_REQUESTS =
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java
index 0a530dd3c9b..f859ca73285 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -98,7 +98,7 @@ import static org.mockito.Mockito.when;
 public class TestCapacitySchedulerAutoQueueCreation
     extends TestCapacitySchedulerAutoCreatedQueueBase {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       TestCapacitySchedulerAutoQueueCreation.class);
 
   private static final Resource TEMPLATE_MAX_RES = Resource.newInstance(16 *
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerDynamicBehavior.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerDynamicBehavior.java
index 9aba30c2e88..104145ec122 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerDynamicBehavior.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerDynamicBehavior.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.fail;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
@@ -40,8 +40,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class TestCapacitySchedulerDynamicBehavior {
-  private static final Log LOG = LogFactory
-      .getLog(TestCapacitySchedulerDynamicBehavior.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestCapacitySchedulerDynamicBehavior.class);
   private static final String A = CapacitySchedulerConfiguration.ROOT + ".a";
   private static final String B = CapacitySchedulerConfiguration.ROOT + ".b";
   private static final String B1 = B + ".b1";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerMultiNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerMultiNodes.java
index c90af94a169..d4335ee9775 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerMultiNodes.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerMultiNodes.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.MockAM;
@@ -46,8 +46,8 @@ import org.junit.Test;
  */
 public class TestCapacitySchedulerMultiNodes extends CapacitySchedulerTestBase {
 
-  private static final Log LOG = LogFactory
-      .getLog(TestCapacitySchedulerMultiNodes.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestCapacitySchedulerMultiNodes.class);
   private CapacitySchedulerConfiguration conf;
   private static final String POLICY_CLASS_NAME =
       "org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement.ResourceUsageMultiNodeLookupPolicy";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerPerf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerPerf.java
index a2ccf6e30e6..09f9fd20b98 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerPerf.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerPerf.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
+import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.Time;
 import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -47,14 +48,11 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEv
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.ResourceUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.Assume;
 import org.junit.Test;
 
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.PriorityQueue;
@@ -199,11 +197,7 @@ public class TestCapacitySchedulerPerf {
     qb.setUserLimitFactor((float)0.0);
 
     // Quiet the loggers while measuring throughput
-    for (Enumeration<?> loggers = LogManager.getCurrentLoggers();
-         loggers.hasMoreElements(); )  {
-      Logger logger = (Logger) loggers.nextElement();
-      logger.setLevel(Level.WARN);
-    }
+    GenericTestUtils.setRootLogLevel(Level.WARN);
     final int topn = 20;
     final int iterations = 2000000;
     final int printInterval = 20000;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
index 93aebace8a0..d568220dc68 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java
@@ -32,8 +32,8 @@ import static org.mockito.Mockito.when;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -70,7 +70,8 @@ import org.mockito.stubbing.Answer;
 
 public class TestChildQueueOrder {
 
-  private static final Log LOG = LogFactory.getLog(TestChildQueueOrder.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestChildQueueOrder.class);
 
   RMContext rmContext;
   YarnConfiguration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
index 9f01a172891..22b311db4dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.security.SecurityUtilTestHelper;
@@ -74,8 +74,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.C
 
 public class TestContainerAllocation {
 
-  private static final Log LOG = LogFactory
-      .getLog(TestContainerAllocation.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestContainerAllocation.class);
 
   private final int GB = 1024;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java
index 307d5aea2a7..f9bc7c4be32 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerResizing.java
@@ -24,8 +24,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
@@ -67,7 +67,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class TestContainerResizing {
-  private static final Log LOG = LogFactory.getLog(TestContainerResizing.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestContainerResizing.class);
   private final int GB = 1024;
 
   private YarnConfiguration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
index 28f02e43407..e21f9e3270c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
@@ -50,8 +50,8 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CyclicBarrier;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -117,7 +117,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.T
 public class TestLeafQueue {
   private final RecordFactory recordFactory = 
       RecordFactoryProvider.getRecordFactory(null);
-  private static final Log LOG = LogFactory.getLog(TestLeafQueue.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestLeafQueue.class);
 
   RMContext rmContext;
   RMContext spyRMContext;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
index a960d896c00..4ef9f7a5f7e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestParentQueue.java
@@ -35,8 +35,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.QueueACL;
 import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
@@ -73,7 +73,8 @@ public class TestParentQueue {
   private static final Resource QUEUE_A_RESOURCE = Resource
       .newInstance(6 * 1024, 10);
 
-  private static final Log LOG = LogFactory.getLog(TestParentQueue.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestParentQueue.class);
   
   RMContext rmContext;
   YarnConfiguration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueCapacities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueCapacities.java
index ee370b483df..86feb5bc33f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueCapacities.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueCapacities.java
@@ -22,8 +22,8 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,7 +32,8 @@ import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class TestQueueCapacities {
-  private static final Log LOG = LogFactory.getLog(TestQueueCapacities.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestQueueCapacities.class);
   private String suffix;
 
   @Parameterized.Parameters
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java
index 1df6b4cded9..fbf092f334c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
 import org.apache.hadoop.yarn.server.resourcemanager.placement.UserGroupMappingPlacementRule;
@@ -32,7 +32,8 @@ import org.junit.Test;
 
 public class TestQueueMappings {
 
-  private static final Log LOG = LogFactory.getLog(TestQueueMappings.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestQueueMappings.class);
 
   private static final String Q1 = "q1";
   private static final String Q2 = "q2";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java
index add14ab2fdc..e496d4622a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueParsing.java
@@ -23,8 +23,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.service.ServiceOperations;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -47,7 +47,8 @@ import com.google.common.collect.ImmutableSet;
 
 public class TestQueueParsing {
 
-  private static final Log LOG = LogFactory.getLog(TestQueueParsing.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestQueueParsing.class);
   
   private static final double DELTA = 0.000001;
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
index a1b536ab464..da0e9c9e6fc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java
@@ -33,8 +33,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
@@ -70,9 +72,6 @@ import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.Resources;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -81,7 +80,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.T
 
 public class TestReservations {
 
-  private static final Log LOG = LogFactory.getLog(TestReservations.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestReservations.class);
 
   private final RecordFactory recordFactory = RecordFactoryProvider
       .getRecordFactory(null);
@@ -732,8 +732,7 @@ public class TestReservations {
   @SuppressWarnings("unchecked")
   public void testAssignContainersNeedToUnreserve() throws Exception {
     // Test that we now unreserve and use a node that has space
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
 
     CapacitySchedulerConfiguration csConf = new CapacitySchedulerConfiguration();
     setup(csConf);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
index 23f6fc4a75f..3a64a8a19d7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java
@@ -19,8 +19,8 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
 import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.*;
 import org.apache.hadoop.yarn.event.Dispatcher;
@@ -62,7 +62,8 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 public class TestUtils {
-  private static final Log LOG = LogFactory.getLog(TestUtils.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestUtils.class);
 
   /**
    * Get a mock {@link RMContext} for use in test cases.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java
index ece32d5217a..3381637fb82 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestLeveldbConfigurationStore.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -45,8 +45,8 @@ import static org.junit.Assert.assertNull;
  */
 public class TestLeveldbConfigurationStore extends ConfigurationStoreBaseTest {
 
-  public static final Log LOG =
-      LogFactory.getLog(TestLeveldbConfigurationStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(TestLeveldbConfigurationStore.class);
   private static final File TEST_DIR = new File(
       System.getProperty("test.build.data",
           System.getProperty("java.io.tmpdir")),
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java
index 0e1a1e648e8..ebac8714940 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestZKConfigurationStore.java
@@ -18,8 +18,8 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryNTimes;
@@ -58,8 +58,8 @@ import static org.junit.Assert.assertTrue;
  */
 public class TestZKConfigurationStore extends ConfigurationStoreBaseTest {
 
-  public static final Log LOG =
-      LogFactory.getLog(TestZKConfigurationStore.class);
+  public static final Logger LOG =
+      LoggerFactory.getLogger(TestZKConfigurationStore.class);
 
   private static final int ZK_TIMEOUT_MS = 10000;
   private TestingServer curatorTestingServer;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/TestPlacementProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/TestPlacementProcessor.java
index e129a750c17..76df0571dd3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/TestPlacementProcessor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/TestPlacementProcessor.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.constraint;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ExecutionType;
@@ -74,8 +74,8 @@ public class TestPlacementProcessor {
 
   private static final int GB = 1024;
 
-  private static final Log LOG =
-      LogFactory.getLog(TestPlacementProcessor.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestPlacementProcessor.class);
   private MockRM rm;
   private DrainDispatcher dispatcher;
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java
index 2416d8cf9e5..d7ec1621910 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java
@@ -23,8 +23,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
 import org.apache.hadoop.yarn.api.records.Container;
@@ -46,8 +46,8 @@ import org.junit.Test;
  */
 public class TestApplicationMasterServiceWithFS {
 
-  private static final Log LOG =
-      LogFactory.getLog(TestApplicationMasterServiceWithFS.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestApplicationMasterServiceWithFS.class);
 
   private static final int GB = 1024;
   private static final int MEMORY_ALLOCATION = 3 * GB;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerConfiguration.java
index 1f60fd49799..2a2d2683fbd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerConfiguration.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
 import org.apache.hadoop.yarn.api.records.Resource;
@@ -33,6 +32,8 @@ import org.apache.hadoop.yarn.util.resource.ResourceUtils;
 import org.apache.hadoop.yarn.util.resource.Resources;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -667,8 +668,8 @@ public class TestFairSchedulerConfiguration {
   @Test
   public void testMemoryIncrementConfiguredViaMultipleProperties() {
     TestAppender testAppender = new TestAppender();
-    Log4JLogger logger = (Log4JLogger) FairSchedulerConfiguration.LOG;
-    logger.getLogger().addAppender(testAppender);
+    Logger logger = LogManager.getRootLogger();
+    logger.addAppender(testAppender);
     try {
       Configuration conf = new Configuration();
       conf.set("yarn.scheduler.increment-allocation-mb", "7");
@@ -686,15 +687,15 @@ public class TestFairSchedulerConfiguration {
               "overriding the yarn.scheduler.increment-allocation-mb=7 " +
               "property").equals(e.getMessage())));
     } finally {
-      logger.getLogger().removeAppender(testAppender);
+      logger.removeAppender(testAppender);
     }
   }
 
   @Test
   public void testCpuIncrementConfiguredViaMultipleProperties() {
     TestAppender testAppender = new TestAppender();
-    Log4JLogger logger = (Log4JLogger) FairSchedulerConfiguration.LOG;
-    logger.getLogger().addAppender(testAppender);
+    Logger logger = LogManager.getRootLogger();
+    logger.addAppender(testAppender);
     try {
       Configuration conf = new Configuration();
       conf.set("yarn.scheduler.increment-allocation-vcores", "7");
@@ -712,7 +713,7 @@ public class TestFairSchedulerConfiguration {
               "overriding the yarn.scheduler.increment-allocation-vcores=7 " +
               "property").equals(e.getMessage())));
     } finally {
-      logger.getLogger().removeAppender(testAppender);
+      logger.removeAppender(testAppender);
     }
   }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestSchedulingPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestSchedulingPolicy.java
index b016c1b4fb8..9c6b0f49347 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestSchedulingPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestSchedulingPolicy.java
@@ -26,8 +26,8 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.Stack;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy;
@@ -42,7 +42,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
 
 public class TestSchedulingPolicy {
-  private static final Log LOG = LogFactory.getLog(TestSchedulingPolicy.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestSchedulingPolicy.class);
   private final static String ALLOC_FILE =
       new File(FairSchedulerTestBase.TEST_DIR, "test-queues").getAbsolutePath();
   private FairSchedulerConfiguration conf;
@@ -202,7 +203,7 @@ public class TestSchedulingPolicy {
       if (fairShareComparator.compare(copy[0], copy[2]) <= 0) {
         return true;
       } else {
-        LOG.fatal("Failure data: " + copy[0] + " " + copy[1] + " " + copy[2]);
+        LOG.error("Failure data: " + copy[0] + " " + copy[1] + " " + copy[2]);
         return false;
       }
     }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index ee66a49032f..f9093c18d4e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -31,8 +31,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.net.NetworkTopology;
 import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
@@ -105,9 +107,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManag
 import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.resource.Resources;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -115,7 +114,8 @@ import org.junit.Test;
 import org.mockito.Mockito;
 
 public class TestFifoScheduler {
-  private static final Log LOG = LogFactory.getLog(TestFifoScheduler.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestFifoScheduler.class);
   private final int GB = 1024;
 
   private ResourceManager resourceManager = null;
@@ -654,8 +654,7 @@ public class TestFifoScheduler {
   @Test(timeout = 60000)
   public void testAllocateContainerOnNodeWithoutOffSwitchSpecified()
       throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
 
     MockRM rm = new MockRM(conf);
     rm.start();
@@ -686,8 +685,7 @@ public class TestFifoScheduler {
 
   @Test(timeout = 60000)
   public void testFifoScheduling() throws Exception {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     MockRM rm = new MockRM(conf);
     rm.start();
     MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB);
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
index bcf239dfad6..53221d88d6e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java
@@ -31,8 +31,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.io.Text;
@@ -77,7 +77,8 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TestAMRMTokens {
 
-  private static final Log LOG = LogFactory.getLog(TestAMRMTokens.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestAMRMTokens.class);
 
   private final Configuration conf;
   private static final int maxWaitAttempts = 50;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
index dca3686c503..d973dca3c73 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java
@@ -48,8 +48,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FileSystem;
@@ -118,8 +118,8 @@ import com.google.common.base.Supplier;
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class TestDelegationTokenRenewer {
-  private static final Log LOG = 
-      LogFactory.getLog(TestDelegationTokenRenewer.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestDelegationTokenRenewer.class);
   private static final Text KIND =
       DelegationTokenRenewer.HDFS_DELEGATION_KIND;
   
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java
index 5b55d680678..c660f9b71b3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java
@@ -49,9 +49,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemoryRMStateStore
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore;
 import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore.RMState;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.event.Level;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,8 +60,7 @@ public class TestRMDelegationTokens {
 
   @Before
   public void setup() {
-    Logger rootLogger = LogManager.getRootLogger();
-    rootLogger.setLevel(Level.DEBUG);
+    GenericTestUtils.setRootLogLevel(Level.DEBUG);
     ExitUtil.disableSystemExit();
     testConf = new YarnConfiguration();
     testConf
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
index 21df698bda1..0b2c6fe511e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java
@@ -28,8 +28,8 @@ import java.util.ArrayList;
 
 import javax.ws.rs.core.MediaType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.http.JettyUtils;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -66,8 +66,8 @@ public class TestRMWebServicesNodeLabels extends JerseyTestBase {
 
   private static final int BAD_REQUEST_CODE = 400;
 
-  private static final Log LOG = LogFactory
-      .getLog(TestRMWebServicesNodeLabels.class);
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestRMWebServicesNodeLabels.class);
 
   private static MockRM rm;
   private static YarnConfiguration conf;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
index 40cf483cd3a..91b92de9f43 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.http.JettyUtils;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.ContainerState;
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertEquals;
 public class TestRMWebServicesSchedulerActivities
     extends TestRMWebServicesCapacitySched {
 
-  private static final Log LOG = LogFactory.getLog(
+  private static final Logger LOG = LoggerFactory.getLogger(
       TestRMWebServicesSchedulerActivities.class);
 
   @Test
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
index 150f91c6423..ffb5ebc1cea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
@@ -640,7 +640,7 @@ Privileged Container Security Consideration
 
 Privileged docker container can interact with host system devices.  This can cause harm to host operating system without proper care.  In order to mitigate risk of allowing privileged container to run on Hadoop cluster, we implemented a controlled process to sandbox unauthorized privileged docker images.
 
-The default behavior is disallow any privileged docker containers.  When `docker.privileged-containers.enabled` is set to enabled, docker image can run with root privileges in the docker container, but access to host level devices are disabled.  This allows developer and tester to run docker images from internet without causing harm to host operating system.
+The default behavior disallows any privileged docker containers.  Privileged docker is only allowed with ENTRYPOINT enabled docker image, and `docker.privileged-containers.enabled` is set to enabled.  Docker image can run with root privileges in the docker container, but access to host level devices are disabled.  This allows developer and tester to run docker images from internet with some restrictions to prevent harm to host operating system.
 
 When docker images have been certified by developers and testers to be trustworthy.  The trusted image can be promoted to trusted docker registry.  System administrator can define `docker.trusted.registries`, and setup private docker registry server to promote trusted images.  System administrator may choose to allow official docker images from Docker Hub to be part of trusted registries.  "library" is the name to use for trusting official docker images.  Container-executor.cfg example:
 
@@ -881,10 +881,6 @@ registry.json
 
 For further details and parameters that could be configured in the S3 storage driver, please refer https://docs.docker.com/registry/storage-drivers/s3/.
 
-### Docker Registry with CSI Driver
-
-CSI driver enables third party storage system to expose as posix mount point in the container.  This allows Docker Trusted Registry to write docker images to an external storage.
-
 Example: MapReduce
 ------------------
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
index da7a9c434ae..e0d1c016389 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
@@ -165,6 +165,19 @@ where `service-name` is optional. If omitted, it uses the name defined in the `Y
 Look up your IPs at the RM REST endpoint `http://<RM host>:8088/app/v1/services/httpd-service`.
 Then visit port 8080 for each IP to view the pages.
 
+## Application Catalog - appcatalog
+
+Application Catalog introduces many exciting new features for deploying Hadoop software that benefit both administrators and end users.  With Application Catalog, user gets a personalized view of the software status in Hadoop.  In addition, users can install or register applications by using web-based user interface.
+
+To start Application Catalog service with the command:
+```
+yarn app -launch <service-name> appcatalog
+```
+where `service-name` is user defined name.
+
+The deployment progress of the application catalog is located in Resource Manager UI.  When the service reaches STABLE state, application catalog UI is available at:
+http://appcatalog.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/
+
 ## Docker image ENTRYPOINT support
 
 Docker images may have built with ENTRYPOINT to enable start up of docker image without any parameters.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
index def4c129a9e..a6c14628ddc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
@@ -165,7 +165,7 @@ export default Ember.Controller.extend({
 
   getSortedVizDataInDesc: function(data) {
     return data.sort(function(d1, d2) {
-      return d2.value - d1.value;
+      return d2.createdTs - d1.createdTs;
     });
   },
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
index 8d9fca36dcd..9bcf1e174e2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
@@ -46,7 +46,8 @@ export default DS.Model.extend({
       label: this.get('runid'),
       value: this.get('runDurationTs'),
       tooltip: this.get("shownid") + "<br>" + Converter.msToElapsedTimeUnit(this.get('runDurationTs')),
-      flowrunUid: this.get('uid')
+      flowrunUid: this.get('uid'),
+      createdTs: this.get('createTimeRaw')
     };
   },
 
@@ -55,7 +56,8 @@ export default DS.Model.extend({
       label: this.get('runid'),
       value: this.get('cpuVCores'),
       tooltip: this.get("shownid") + "<br>" + 'CPU VCores: ' + this.get('cpuVCores'),
-      flowrunUid: this.get('uid')
+      flowrunUid: this.get('uid'),
+      createdTs: this.get('createTimeRaw')
     };
   },
 
@@ -64,7 +66,8 @@ export default DS.Model.extend({
       label: this.get('runid'),
       value: this.get('memoryUsed'),
       tooltip: this.get("shownid") + "<br>" + 'Memory Used: ' + Converter.memoryBytesToMB(this.get('memoryUsed')),
-      flowrunUid: this.get('uid')
+      flowrunUid: this.get('uid'),
+      createdTs: this.get('createTimeRaw')
     };
   }
 });
diff --git a/pom.xml b/pom.xml
index 6c385a0e764..0dd1bed77c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,6 +406,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <exclude>**/*.js</exclude>
             <exclude>hadoop-hdds/**/</exclude>
             <exclude>hadoop-ozone/**/</exclude>
+            <exclude>hadoop-submarine/target/**</exclude>
+            <exclude>hadoop-submarine/**/target/**</exclude>
          </excludes>
        </configuration>
       </plugin>