Backport/3.0.x/rollback additional pc synchronization because of deadlock at startup