This has been improved in rev#80952. The fix will be available in next 6.5 intermediate release. Thank you for the report.