3.1.2 Performance changes

Performance changes for the upcoming 3.1.2