It's useful to scope the block handler into a selector
Merge branch 'features/limit-block-handler'