Merge branch 'block-handling' into 'develop'