Merge blocks (10/30)

Merge blocks