Applied to 6.3 which will be released in a week or 2. Did not port to 6.2 as this should not be applied to a bugfix release.

Thanks!