DIAP-446

Part of DIAP-446