DIAP-397

Part of DIAP-397