DIAP-227

Part of DIAP-227