DIAP-172

Part of DIAP-172