pull recent spring changes