Slightly improve cluster performance
merge and performance upgrades