Minor changes, code still need polishing
Authored by: paulatz 2019-06-03
Parent: [r482]
Child: [r484]