Merge "Spring controlled back progress API"