Add and update licenses in CDS
Merge remote-tracking branch 'origin/develop' into develop