POC for #1987
Merge pull request #1 from LearnBoost/gh-1987

From LearnBoost POC for #1987