AI-581 - added skip expression persistence