This is already addressed in the 6.3.8 betas, and will roll out with the final 6.3.8 update soon.
Cheers,
—Nik