Merge "BUG-1493: activate recursion elision"