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