FORGE-1733: Fixed shell impl to support this