Feature #6278