Fix testfor #1208
Merge pull request #2067 from yakky/feature/fix_1208_test

Fix test for #1208
Adds tests and fixes leak in field.
Merge remote-tracking branch 'upstream/develop' into dynamic-placeholder-field