DIAP-464

Part of DIAP-464