Attempt to merge 1.8 coming soon