Integrate the latest smart-util changes into smart-dao