20140720-0020: Performance tuning