Improved block variable handling
Merge branch 'release/1.1.2'