DIAP-512

Part of DIAP-512