Feature #6314