Merge in latest changes from Fusion