DIAP-161

Part of DIAP-161