Merge "Fix deadlock" into lmp-preview-dev