DIAP-228

Part of DIAP-228