Merge branch 'ComponentRework' into 'master'

Automated Json Serialization

See merge request !10
1 job for master in 49 seconds (queued for 1 second)
Status Name Job ID Coverage
  Linux
passed masterJobLinux #919970

00:00:49