fixed form views for child elements
Merge branch 'release/1.6' into develop