DIAP-667

Part of DIAP-667