DIAP-487

Part of DIAP-487