Include YARN-934 patch