DIAP-514

Part of DIAP-514