DIAP-252

Part of DIAP-252