DIAP-596

Part of DIAP-596