Merging performance changes from @Xars