DIAP-670

Part of DIAP-670