DIAP-521

Part of DIAP-521