Merge "improve performance of blockimgdiff" into nyc-dev