Comment 24 for bug 1641238

Commit on trunk does not work for me. I will send logs privately to Yann.