DIAP-432

Part of DIAP-432