DIAP-467

Part of DIAP-467