Merge branch 'CCS' into UnitTesting
Fixed parser (empty string -> null change)
Merge branch 'UnitTesting' into CCS