EDST-68: please merge into EDST-51

Please do not merge this into EDST-51 because EDST-69 will contain the code EDST-68 as well.