DIAP-419

Part of DIAP-419