Feature #6182