NEXUS-5965: Preparations for IT
NEXUS-5956: Client parts for new capability
NEXUS-5956: IT