DIAP-152

Part of DIAP-152