Merge blocks (3/30)

Merge blocks