DIAP-163

Part of DIAP-163