Feature #6281