DIAP-363

Part of DIAP-363