DIAP-455

Part of DIAP-455