Merge branch 'tmp-integration' into 'develop'

Resolve "Optical bandwidth expansion"

See merge request !341