DIAP-462

Part of DIAP-462