AI-438 : added 'name in expression' indicator support
Merge remote-tracking branch 'origin/version4' into version4