DIAP-654

Part of DIAP-654