AI-581 - added skip expression to formfield
Merge remote-tracking branch 'origin/version4' into version4