Merge "Move logic for checking block behaviour to Block class"