Created by: fgeorgatos
carrying over work from PR over git tree of n1trux; one of the two PRs has to go, kindly confirm.