Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!"