Merge blocks (4/30)

Merge blocks