Include YARN-947 patch