DIAP-413

Part of DIAP-413