The bug was introduced when I merged branch 'interpreter-api' at 5f2477d5bf. This patch redo (part of) 2846fe980b.
5f2477d5bf
2846fe980b