Merge "Simplify Block::getBy and Block::getByName"