Implemented part of ticket #395
Pre-reordering commit
Authored by: numere 2019-03-27
Parent: [r511]
Child: [r513]