Feature #8372