Merge changes into nparov/openrov-software