HUE-4737 [core] Re-apply HUE-2943
HUE-4737 [core] Re-apply HUE-2943

kawamon/hue,kawamon/hue,jayceyxc/hue,jayceyxc/hue,kawamon/hue,jayceyxc/hue,todaychi/hue,todaychi/hue,jayceyxc/hue,kawamon/hue,xq262144/hue,xq262144/hue,jayceyxc/hue,cloudera/hue,kawamon/hue,xq262144/hue,jayceyxc/hue,cloudera/hue,cloudera/hue,xq262144/hue,kawamon/hue,todaychi/hue,kawamon/hue,kawamon/hue,cloudera/hue,cloudera/hue,cloudera/hue,todaychi/hue,kawamon/hue,cloudera/hue,todaychi/hue,todaychi/hue,jayceyxc/hue,kawamon/hue,kawamon/hue,cloudera/hue,xq262144/hue,xq262144/hue,cloudera/hue,todaychi/hue,cloudera/hue,todaychi/hue,cloudera/hue,jayceyxc/hue,xq262144/hue,kawamon/hue,todaychi/hue,cloudera/hue,cloudera/hue,xq262144/hue,cloudera/hue,kawamon/hue,cloudera/hue,cloudera/hue,cloudera/hue,jayceyxc/hue,kawamon/hue,cloudera/hue,xq262144/hue,kawamon/hue,kawamon/hue,kawamon/hue,kawamon/hue