DIAP-476

Part of DIAP-476