14 Commits (safer-thread-move)