DIAP-479

Part of DIAP-479