Merge branch 'develop' into feat/239-cttc-driver-required-to-interact-with-nce-controller