This issue is now fixed in rev#86111 for the 6.8 release.