Include YARN-956 patch