You can wait for 6.5.2, which is currently in private beta testing.