The code marked with
// TODO The THREAD declarations below should be removed
in synchronizer.cpp should be fixed after the merge.