DIAP-502

Part of DIAP-502