Fixed calculation issue in like rebuild worker
Merge branch '2.0'