Feature #6495