DIAP-456

Part of DIAP-456