Merge "Fixing asynchronous performance issues."