Also update model for changes inside nested blocks
Replaced _this with @. Copy/paste from debugger mishap.
Merge remote-tracking branch 'origin/performance-enhancements'