Merging update from hailg