FORGE-829: Support UNDERLINE shell mode