Merge "More performance improvements"