YARN-1250. Addendum