Fix circular block compare crash, CC#1049
Merge branch 'compare-crash' into community