DIAP-687

Part of DIAP-687