Merge pull request #1766 from shackbarth/fielddev