HIVE-4503
(cherry picked from commit 17d12eea9805208dae40fe7c955bd73ccdaf3559)