Merge branch 'release/4.2' into Development
Minor logic improvements. @todo create some sort of unique field that also handles reserved values.
Minor date-fixes
Merge branch 'release/4.2.1'