TEZ-1125. Pre-warm broken (bikas)
Merge remote branch 'origin/apache-ref/master' into champlain