Contributed-by: navinko <nakumr@cloudera.com> (cherry picked from commit 4891bf50491373306b89cb5cc310b9d5ebf35156)