Scoping problem with blocks, instance variables and values, fixes #399
Merge remote-tracking branch 'origin/ncb/development' into pvj/main