DIAP-523

Part of DIAP-523