replace old ModernBlockData with direct BlockData ref (commit: 911e31c)
switch command modernization (commit: aab0364)