DIAP-267

Part of DIAP-267