After some discussions we decided to use the implementation in the 2_0_0_ekt_dev branch as a starting point