More locking
Merge branch 'master' of https://github.com/uissubsea/rov-topside