DIAP-499

Part of DIAP-499