DIAP-277

Part of DIAP-277