we should have one dedicated PR for that... @fgeorgatos? ;-)