Merge "Add AbstractBlock parent class for Block"