fixes for cluster branch to work with master