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