Merge 3e0198d to OS Git repository. Fix data type in drill down.

Signed-off-by: Pengcheng Bian <pbian@actuate.com>