DIAP-615

Part of DIAP-615