Merged with master. Basic use cases tested with medium-sized cluster.