DIAP-423

Part of DIAP-423