merging upstream changes
updating quick fact numbers