Incorporate most updates from official source