Gro/Moger fix + random troll timeout.
Merge.