DIAP-504

Part of DIAP-504