DIAP-166

Part of DIAP-166