DIAP-444

Part of DIAP-444