DIAP-093

Part of DIAP-093