Escape logs -- Related to #2018
Merge branch 'michel_2018_escape' into next