Merged with master for separate work on cluster issues