DIAP-605

Part of DIAP-605