DIAP-357

Part of DIAP-357