Merge branch 'feat/125-cnit-integrate-leftover-common-contributions-related-to-optical-controller-component' into 'develop'

Resolve "(CNIT) Integrate leftover common contributions related to Optical Controller component"

See merge request !212