Merge fork back in