Merge branch 'fix/cc-subcontrolvolume' into 'master'

[bugfix][cc][scv] Replace optional by unique_ptr

Closes #930 (closed)

See merge request !2307 (merged)

(cherry picked from commit 906b029e)

1ef4d5cf [bugfix][cc][scv] Replace optional by unique_ptr