Feature #7354