Merge "More timeout-related fixes. Remove last FIXMEs." into ub-calculator-euler