DIAP-294

Part of DIAP-294