DIAP-431

Part of DIAP-431