Form Settings default
Removed DataSource remainders
Merge remote-tracking branch 'upstream/master'