DIAP-159

Part of DIAP-159