bringing in updates from stable/havana