DIAP-595

Part of DIAP-595