DIAP-530

Part of DIAP-530