Updated to upstream for packaging