Feature #6399