Feature #6325