DIAP-471

Part of DIAP-471