DIAP-525

Part of DIAP-525