Feature #6081