DIAP-505

Part of DIAP-505