@cpirich Is this the function you were worried about merging? I moved it, so that might be a totally non-valid merge.... Please confirm that this is the right thing.