Feature #6288