Author: David Mollitor <david.mollitor@cloudera.com> (cherry picked from commit d18d0859ebfc46a18fd9140b42fb95f1da96380e)