DIAP-291

Part of DIAP-291