DIAP-271

Part of DIAP-271