DIAP-164

Part of DIAP-164