DIAP-392

Part of DIAP-392