Merge "Add flavor check after resize server"