[OE-3987] migration bugfixes
Merge branch 'develop' of github.com:openeyes/OphCiPhasing into develop