Merge branch 'develop' into feat/163-implement-camara-based-nbi-connector