Merge "Speed-up Class.getSimpleName()" into main