AI-621 - used explicit container for formfields
Merge remote-tracking branch 'origin/version4' into version4