Temp commit (testing Hudson)
Mandatory fields for different items are different
Merge branch 'fix_tests' into master-dev