integrate util 1.0.6 in progress