Improvements to the optical cybersecurity component addressing previous issues See merge request !127