IDE-1328.  block():void is no longer assignable to block():non-void
Merge remote-tracking branch 'origin/spec' into spec