DIAP-537

Part of DIAP-537