Refactored ExpressionExpander
Merge remote-tracking branch 'private/new_visibility' into new_visibility
Shell script usage change