Partial solution of issue #20