DIAP-506

Part of DIAP-506