DIAP-652

Part of DIAP-652