Merge "improve performance of blockimgdiff"