Incorporated changes in en version range 5294:5424
Authored by: jensmf 2017-09-15
Parent: [r5424]
Child: [r5426]