migrated remaining blocks to the new mj API, close #1578