Matched my changes with the fork merge.