Consolidate block rules #1428