DIAP-157

Part of DIAP-157