DIAP-511

Part of DIAP-511