DIAP-453

Part of DIAP-453