Merge branch 'cnit-optical-band-expansion' into 'tmp-integration'

Integrate "cnit-optical-band-expansion" into "tmp-integration"

See merge request !398