Issue #680. Adjustments for the next try.
Authored by: hotzst 2018-04-28
Parent: [r4558]
Child: [r4560]