DIAP-434

Part of DIAP-434