DIAP-509

Part of DIAP-509