Separate YARN-474 from YARN-209