Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
working on #672 NOTE: This commit can't be compiled!!