Merge "Port to the tempest stable plugin interface (clients)"