DIAP-445

Part of DIAP-445