DIAP-621

Part of DIAP-621