AI-581 - added restore ui functionality from skip expression
Merge remote-tracking branch 'origin/version4' into version4