# GG-8646 - gg-8646 Security events in Visor.
# GG-8646 - gg-8646 Restored.
# GG-8646 Merged with sprint-25
Merge branches 'gg-8646' and 'sprint-25-6.2.0' of https://github.com/ggprivate/ggprivate into gg-8646
# Client prototype
Merge remote-tracking branch 'remotes/origin/sprint-25-6.2.0' into gg-client-proto

Conflicts:
	modules/clients/dotnet/client-lib/client/impl/portable/GridClientPortableTypeDescriptor.cs
	modules/clients/dotnet/client-lib/client/impl/portable/GridClientPortableWriteContext.cs
Merge remote-tracking branch 'origin/gg-client-proto' into gg-8982-dotnet

Conflicts:
	modules/clients/dotnet/client-lib/client/impl/portable/GridClientPortableMarshaller.cs
	modules/clients/dotnet/client-lib/client/impl/portable/GridClientPortableSystemHandlers.cs
	modules/clients/dotnet/client-lib/client/impl/portable/GridClientPortableWriteContext.cs
# gg-8982: WIP.
# gg-8982: Added processor for interop cache access.
# gg-8982: Implemented put/get.
# GG-8988 Portables metadata dialog.
# gg-8982: WIP.
Merge branches 'gg-8988' and 'sprint-26' of https://github.com/ggprivate/ggprivate into gg-8988
#GG-8988 Review.
Merge branches 'gg-8646' and 'sprint-26' of https://github.com/ggprivate/ggprivate into gg-8646
Merge branches 'gg-8646' and 'sprint-26' of https://github.com/ggprivate/ggprivate into gg-8646
# gg-8999: WIP on Java streams.
# gg-8999: WIP on benchmarks.
Merge branch 'sprint-26' into gg-8982-dotnet

Conflicts:
	modules/clients/dotnet/client-lib/libs/GridGainClient.dll
	modules/clients/dotnet/client-lib/libs/GridGainClient.pdb
Merge branch 'gg-8982-dotnet' into gg-8982-9001

Conflicts:
	modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableReaderImpl.java