Release 5.8.6

Performance fix with Custom Display