Merge "Add block restriction classes"