DIAP-436

Part of DIAP-436