AI-581 - skip expression builder