Feature #6178