-
Fri Dec 04 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.403.4.el7uek]
- icmp: randomize the global rate limiter (Eric Dumazet) [Orabug: 32227961] {CVE-2020-25705}
- ocfs2: initialize ip_next_orphan (Wengang Wang) [Orabug: 32159055]
- hv_netvsc: make recording RSS hash depend on feature flag (Stephen Hemminger) [Orabug: 32159975]
- hv_netvsc: record hardware hash in skb (Stephen Hemminger) [Orabug: 32159975]
- Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts (Peilin Ye) [Orabug: 32176263] {CVE-2020-28915}
- fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h (Peilin Ye) [Orabug: 32176263] {CVE-2020-28915}
- block: Fix use-after-free in blkdev_get() (Jason Yan) [Orabug: 32194608] {CVE-2020-15436}
- serial: 8250: fix null-ptr-deref in serial8250_start_tx() (Yang Yingliang) [Orabug: 32194712] {CVE-2020-15437}
- staging: rts5208: rename SG_END macro (Arnd Bergmann) [Orabug: 32218496]
- misc: rtsx: rename SG_END macro (Arnd Bergmann) [Orabug: 32218496]
-
Fri Nov 27 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.403.3.el7uek]
- RDMA/umem: Move to allocate SG table from pages (Maor Gottlieb) [Orabug: 32005117]
- lib/scatterlist: Add support in dynamic allocation of SG table from pages (Maor Gottlieb) [Orabug: 32005117]
- lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings (Anshuman Khandual) [Orabug: 32005117]
- lib/scatterlist: Avoid potential scatterlist entry overflow (Tvrtko Ursulin) [Orabug: 32005117]
- lib/scatterlist: Fix offset type in sg_alloc_table_from_pages (Tvrtko Ursulin) [Orabug: 32005117]
- uek-rpm: Don't build emb2 kernel for mips (Dave Kleikamp) [Orabug: 32176889]
- vt: Disable KD_FONT_OP_COPY (Daniel Vetter) [Orabug: 32187748] {CVE-2020-28974}
- page_frag: Recover from memory pressure (Dongli Zhang) [Orabug: 32201999]
- xen/events: block rogue events for some time (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: defer eoi in case of excessive number of events (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: use a common cpu hotplug hook for event channels (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: switch user event channels to lateeoi model (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/pciback: use lateeoi irq binding (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/pvcallsback: use lateeoi irq binding (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/scsiback: use lateeoi irq binding (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/netback: use lateeoi irq binding (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/blkback: use lateeoi irq binding (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: add a new "late EOI" evtchn framework (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: fix race in evtchn_fifo_unmask() (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: add a proper barrier to 2-level uevent unmasking (Juergen Gross) [Orabug: 32177538] {CVE-2020-27673}
- xen/events: avoid removing an event channel while handling it (Juergen Gross) [Orabug: 32177548]
-
Fri Nov 20 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.403.2.el7uek]
- tty: make FONTX ioctl use the tty pointer they were actually passed (Linus Torvalds) [Orabug: 32122729] {CVE-2020-25668}
- vt: keyboard, extend func_buf_lock to readers (Jiri Slaby) [Orabug: 32122952] {CVE-2020-25656} {CVE-2020-25656}
- vt: keyboard, simplify vt_kdgkbsent (Jiri Slaby) [Orabug: 32122952] {CVE-2020-25656}
- perf/core: Fix a memory leak in perf_event_parse_addr_filter() (kiyin(尹亮)) [Orabug: 32131175] {CVE-2020-25704}
- perf/core: Fix bad use of igrab() (Song Liu) [Orabug: 32131175] {CVE-2020-25704}
- IB/mlx4: Adjust delayed work when a dup is observed (Håkon Bugge) [Orabug: 32136898]
- IB/mlx4: Add support for REJ due to timeout (Håkon Bugge) [Orabug: 32136898]
- IB/mlx4: Fix starvation in paravirt mux/demux (Håkon Bugge) [Orabug: 32136898]
- IB/mlx4: Separate tunnel and wire bufs parameters (Håkon Bugge) [Orabug: 32136898]
- IB/mlx4: Add support for MRA (Håkon Bugge) [Orabug: 32136898]
- IB/mlx4: Add and improve logging (Håkon Bugge) [Orabug: 32136898]
- xen/gntdev: fix up blockable calls to mn_invl_range_start (Michal Hocko) [Orabug: 32139244]
-
Fri Nov 13 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.403.1.el7uek]
- lockdown: By default run in integrity mode. (Konrad Rzeszutek Wilk) [Orabug: 32131561]
- Revert "iomap: Fix pipe page leakage during splicing" (George Kennedy) [Orabug: 32136519]
- kernel: add panic_on_taint (Rafael Aquini) [Orabug: 32138016]
- Revert "pci: hardcode enumeration" (Dave Aldridge) [Orabug: 32152249]
- hv_utils: drain the timesync packets on onchannelcallback (Vineeth Pillai) [Orabug: 32152144]
- hv_utils: return error if host timesysnc update is stale (Vineeth Pillai) [Orabug: 32152144]
-
Tue Nov 10 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.403.0.el7uek]
- powercap: restrict energy meter to root access (Kanth Ghatraju) [Orabug: 32138487] {CVE-2020-8694} {CVE-2020-8695}
- Btrfs: fix selftests failure due to uninitialized i_mode in test inodes (Filipe Manana) [Orabug: 31864726]
- btrfs: fix return value mixup in btrfs_get_extent (Pavel Machek) [Orabug: 31864726]
- btrfs: inode: Verify inode mode to avoid NULL pointer dereference (Qu Wenruo) [Orabug: 31864726] {CVE-2019-19816}
- x86/apic: Get rid of multi CPU affinity (Thomas Gleixner) [Orabug: 31975320]
- hv_netvsc: Set probe mode to sync (Haiyang Zhang) [Orabug: 32132413]
- net/rds: Check for NULL rds_ibdev in rds_ib_rx() only if rds_ib_srq_enabled (Sharath Srinivasan) [Orabug: 32113843]
- perf symbols: Check if we read regular file in dso__load() (Jiri Olsa) [Orabug: 30696035]
- rds: Restore MR use-once semantics (Håkon Bugge) [Orabug: 31990092] [Orabug: 31990095]
- rds: Fix incorrect cmsg status and use-after-free (Håkon Bugge) [Orabug: 32003078] [Orabug: 32003081]
- dm cache: remove all obsolete writethrough-specific code (Mike Snitzer) [Orabug: 32010352]
- dm cache: pass cache structure to mode functions (Mike Snitzer) [Orabug: 32010352]
- dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue() (Ming Lei) [Orabug: 32010352]
- bcache: allocate meta data pages as compound pages (Coly Li) [Orabug: 32010352]
- md/raid5: Fix Force reconstruct-write io stuck in degraded raid5 (ChangSyun Peng) [Orabug: 32010352]
- bcache: fix super block seq numbers comparision in register_cache_set() (Coly Li) [Orabug: 32010352]
- md-cluster: fix wild pointer of unlock_all_bitmaps() (Zhao Heming) [Orabug: 32010352]
- dm: use noio when sending kobject event (Mikulas Patocka) [Orabug: 32010352]
- dm zoned: assign max_io_len correctly (Hou Tao) [Orabug: 32010352]
- md: add feature flag MD_FEATURE_RAID0_LAYOUT (NeilBrown) [Orabug: 32010352]
- dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone (Hannes Reinecke) [Orabug: 32010352]
- dm mpath: switch paths in dm_blk_ioctl() code path (Martin Wilck) [Orabug: 32010352]
- dm crypt: avoid truncating the logical block size (Eric Biggers) [Orabug: 32010352]
- md: don't flush workqueue unconditionally in md_open (Guoqing Jiang) [Orabug: 32010352]
- x86/mce/therm_throt: Undo thermal polling properly on CPU offline (Thomas Gleixner) [Orabug: 32010658]
- x86/mce/therm_throt: Do not access uninitialized therm_work (Chuansheng Liu) [Orabug: 32010658]
- x86/mce/therm_throt: Mark throttle_active_work() as __maybe_unused (Arnd Bergmann) [Orabug: 32010658]
- x86/mce/therm_throt: Mask out read-only and reserved MSR bits (Srinivas Pandruvada) [Orabug: 32010658]
- x86/mce/therm_throt: Optimize notifications of thermal throttle (Srinivas Pandruvada) [Orabug: 32010658]
- jiffies: add utility function to calculate delta in ms (Matteo Croce) [Orabug: 32010658]
- rds: Force ordering of {set,clear}_bit operating on m_flags (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- rds: Do not send canceled operations to the transport layer (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- rds: Introduce rds_conn_to_path helper (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Revert "RDS: Drop the connection as part of cancel to avoid hangs" (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Revert "rds: fix warning in rds_send_drop_to()" (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Revert "rds: Use correct conn when dropping connections due to cancel" (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Revert "rds: prevent use-after-free of rds conn in rds_send_drop_to()" (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Revert "rds: Use bitmap to designate dropped connections" (Håkon Bugge) [Orabug: 31505749] [Orabug: 32014809]
- Bluetooth: A2MP: Fix not initializing all members (Luiz Augusto von Dentz) [Orabug: 32021288] {CVE-2020-12352}
- x86/kvm: move kvm_load/put_guest_xcr0 into atomic context (WANG Chao) [Orabug: 32021855]
- arm64: Corrects warning: ISO C90 forbids mixed declarations and code (John Donnelly) [Orabug: 32040061]
- hwrng: cavium: Corrects warning: unused variable 'dev_id' (John Donnelly) [Orabug: 32040066]
- Lock down /proc/kcore (redux!) (Konrad Rzeszutek Wilk) [Orabug: 32053127]
- lockdown: Lock down perf when in confidentiality mode (David Howells) [Orabug: 32053127]
- Lock down kprobes (redux!) (Konrad Rzeszutek Wilk) [Orabug: 32053127]
- debugfs: whitelist spectre mitigation when locked down (Eric Snowberg) [Orabug: 32053127]
- debugfs: Return -EPERM when locked down (Eric Snowberg) [Orabug: 32053127]
- debugfs: Restrict debugfs when the kernel is locked down (David Howells) [Orabug: 32053127]
- lockdown: Add __kernel_is_confidentiality_mode to figure out whether .. (Konrad Rzeszutek Wilk) [Orabug: 32053127]
- dtrace: Restrict access when the kernel is locked down in confidentiality mode (Konrad Rzeszutek Wilk) [Orabug: 32053127]
- bpf: Restrict bpf when kernel lockdown is in confidentiality mode (David Howells) [Orabug: 32053127]
- security: Add a static lockdown policy LSM [diet-version] (Matthew Garrett) [Orabug: 32053127]
- net/rds: Check for NULL rid_dev_rem_complete (Ka-Cheong Poon) [Orabug: 32058618]
- scsi: Corrects warning: passing argument 1 of 'wwn_to_u64' mismatch (John Donnelly) [Orabug: 32059622]
- ipvlan: Corrects warning: label 'unregister_netdev' defined but not used (John Donnelly) [Orabug: 32059740]
- mm, compaction: raise compaction priority after it withdrawns (Vlastimil Babka) [Orabug: 32065218]
- mm, reclaim: cleanup should_continue_reclaim() (Vlastimil Babka) [Orabug: 32065218]
- mm, reclaim: make should_continue_reclaim perform dryrun detection (Hillf Danton) [Orabug: 32065218]
- KVM: Drop "const" attribute from old memslot in commit_memory_region() (Sean Christopherson) [Orabug: 32068898]
- octeontx2-pf: Return proper RSS indirection table size always (Sunil Goutham) [Orabug: 32095651]
- octeontx2-af: Free RVU REE irq properly (Smadar Fuks) [Orabug: 32095651]
- octeontx2-af: Free RVU NIX IRQs properly. (Rakesh Babu) [Orabug: 32095651]
- octeontx2-af: Fix the BPID mask (Subbaraya Sundeep) [Orabug: 32095651]
- octeontx2-pf: Fix receive buffer size calculation (Sunil Goutham) [Orabug: 32095651]
- octeontx2-af: Fix updating wrong multicast list index in NIX_RX_ACTION (Naveen Mamindlapalli) [Orabug: 32095651]
- octeontx2-af: Ratelimit prints from AF error interrupt handlers (Naveen Mamindlapalli) [Orabug: 32095651]
- octeontx2-pf: Avoid null pointer dereference (Subbaraya Sundeep) [Orabug: 32095651]
- octeontx2-af: Check the msix offset return value (Subbaraya Sundeep) [Orabug: 32095651]
- octeontx2-af: make tx nibble fixup is always apply (Stanislaw Kardach) [Orabug: 32095651]
- octeontx2-af: Stop kpu parsing at layer3 for ipv6 fragmented packets. (Abhijit Ayarekar) [Orabug: 32095651]
- octeontx2-pf: Call mbox_reset before incrementing ack (Hariprasad Kelam) [Orabug: 32095651]
- octeontx2-af: Simplify otx2_mbox_reset call (Hariprasad Kelam) [Orabug: 32095651]
- A/A Bonding: Increase number and interval of GARPs sent by rdmaip (Sharath Srinivasan) [Orabug: 32095768]
- net/rds: Force ARP flush upon RDMA_CM_EVENT_ADDR_CHANGE (Gerd Rausch) [Orabug: 32095962]
- rds/ib: Fix: (rds: Deregister all FRWR mr with free_mr) (Manjunath Patil) [Orabug: 32113532]
-
Fri Oct 23 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.402.2.el7uek]
- ocfs2: fix remounting needed after setfacl command (Gang He)
- Fix multiple variable definition with syzkaller (Hans Westgaard Ry) [Orabug: 32008770]
- drm/vmwgfx: Use the dma scatter-gather iterator to get dma addresses (Thomas Hellstrom) [Orabug: 32010349]
- i40e: Corrects i40e_setup_tc and i40e_xdp defined but not used warnings (John Donnelly) [Orabug: 32034050]
- bnxt: Corrects warning: 'struct tc_cls_flower_offload' (John Donnelly) [Orabug: 32041757]
- SCSI: Corrects 'ret' not used warning (John Donnelly) [Orabug: 32041763]
- IB/mlx4: disable CQ time stamping (aru kolappan) [Orabug: 32042520]
- qed: Corrects warning: 'qed_iwarp_ll2_slowpath' defined but not used (John Donnelly) [Orabug: 32052276]
-
Fri Oct 16 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.402.1.el7uek]
- configfs: make ci_type field, some pointers and function arguments const (Bhumika Goyal) [Orabug: 32022427]
- IB/ipoib: Arm "send_cq" to process completions in due time (Gerd Rausch) [Orabug: 31596798]
- hdlc_ppp: add range checks in ppp_cp_parse_cr() (Dan Carpenter) [Orabug: 31989189] {CVE-2020-25643}
- uek-rpm: Create initramfs at postinstall stage also. (Somasundaram Krishnasamy) [Orabug: 32010303]
- SUNRPC: Remove xprt_connect_status() again (John Donnelly) [Orabug: 32010341]
- geneve: add transport ports in route lookup for geneve (Mark Gray) [Orabug: 32014099] {CVE-2020-25645}
- nvme-fc: fix double-free scenarios on hw queues (James Smart) [Orabug: 32019898]
- xfs: fix warning: unused variable 'sb' (John Donnelly) [Orabug: 32010343]
- nvme-pci: remove queue_count_ops for write_queues and poll_queues (Minwoo Im) [Orabug: 32010357]
- nvme: Corrects warning: unused variable 'startka' (John Donnelly) [Orabug: 32010357]
- uek-rpm: config-aarch64-embedded add fast_kexec (Henry Willard) [Orabug: 32010273]
- arm64: kexec: Add optional fast shutdown for kexec (Henry Willard) [Orabug: 32010273]
- ocfs2: remove unused ocfs2_prepare_inode_for_refcount() (John Donnelly) [Orabug: 32007790]
- rds: fixes warning: unused variable 'cache_sz_k' (John Donnelly) [Orabug: 32008320]
- panic: move disabling iommu to after dump_stack() (John Donnelly) [Orabug: 32009003]
- uek-rpm: Add old OL keys to the default .blacklist keyring (Eric Snowberg) [Orabug: 31961118]
- certs: Add ability to preload revocation certs (Eric Snowberg) [Orabug: 31961118]
- certs: Move load_system_certificate_list to a common function (Eric Snowberg) [Orabug: 31961118]
- certs: Add EFI_CERT_X509_GUID support for dbx entries (Eric Snowberg) [Orabug: 31961118] {CVE-2020-26541}
- Revert "l2tp: initialise PPP sessions before registering them" (George Kennedy) [Orabug: 31906205]
- btrfs: Don't submit any btree write bio if the fs has errors (Qu Wenruo) [Orabug: 31265337] {CVE-2019-19377} {CVE-2019-19377} {CVE-2019-19377}
- btrfs: only search for left_info if there is no right_info in try_merge_free_space (Josef Bacik) [Orabug: 31351023] {CVE-2019-19448} {CVE-2019-19448}
- xfs: fix boundary test in xfs_attr_shortform_verify (Eric Sandeen) [Orabug: 31895824] {CVE-2020-14385}
- net: add high_order_alloc_disable sysctl (Eric Dumazet) [Orabug: 31907603]
- mm, page_alloc: double zone's batchsize (Aaron Lu) [Orabug: 31907603]
- mm/free_pcppages_bulk: prefetch buddy while not holding lock (Aaron Lu) [Orabug: 31907603]
- mm/free_pcppages_bulk: do not hold lock when picking pages to free (Aaron Lu) [Orabug: 31907603]
- ghes: Corrects: warning: unused variable 'vaddr' [-Wunused-variable] (John Donnelly) [Orabug: 31995830]
- ACPI: properties: Implement get_match_data() callback (Sinan Kaya) [Orabug: 31995830]
- blk-mq: warning: unused variable 'ctx' (John Donnelly) [Orabug: 31996284]
- x86/mitigations: Restore paranoid checks for int3 handling (Boris Ostrovsky) [Orabug: 31999336]
-
Fri Oct 09 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.402.0.el7uek]
- nbd_genl_status: null check for nla_nest_start (Navid Emamdoost) [Orabug: 31351789] {CVE-2019-16089}
- efi/x86/Add missing error handling to old_memmap 1:1 mapping code (Gen Zhang) [Orabug: 31351924] {CVE-2019-12380}
- RDS: add module parameter to allow module unload or not (Hans Westgaard Ry) [Orabug: 31503865]
- rds: Revert "Disable module unload by default" (Hans Westgaard Ry) [Orabug: 31503865]
- rds/tcp: Enhance stats maintained by rds (Rao Shoaib) [Orabug: 31521372]
- EDAC/i10nm: Update driver to support different bus number config register offsets (Qiuxu Zhuo) [Orabug: 31645136]
- EDAC, {skx,i10nm}: Make some configurations CPU model specific (Qiuxu Zhuo) [Orabug: 31645136]
- mstflint_access: Update driver code to v4.15.0-1 from Github (Itay Avraham) [Orabug: 31682346]
- KVM: x86: minor code refactor and comments fixup around dirty logging (Anthony Yznaga) [Orabug: 31722765]
- KVM: x86: Manually flush collapsible SPTEs only when toggling flags (Sean Christopherson) [Orabug: 31722765]
- KVM: x86: avoid unnecessary rmap walks when creating/moving slots (Anthony Yznaga) [Orabug: 31722765]
- KVM: x86: remove unnecessary rmap walk of read-only memslots (Anthony Yznaga) [Orabug: 31722765]
- cgroup: fix cgroup_sk_alloc() for sk_clone_lock() (Cong Wang) [Orabug: 31779798] {CVE-2020-14356}
- bpf: ensure helper ids match between UEK5, UEK6 and upstream (Alan Maguire) [Orabug: 31860453]
- netfilter: ctnetlink: add a range check for l3/l4 protonum (Will McVicker) [Orabug: 31872862] {CVE-2020-25211}
- vgacon: remove software scrollback support (Linus Torvalds) [Orabug: 31914690] {CVE-2020-14390}
- fbcon: remove soft scrollback code (Linus Torvalds) [Orabug: 31914690] {CVE-2020-14390}
- KVM: nVMX: do not use dangling shadow VMCS after guest reset (Paolo Bonzini) [Orabug: 31941096]
- Revert "usb: xhci: do not create and register shared_hcd when USB3.0 is disabled" (Thomas Tai) [Orabug: 31943628]
- uek-rpm: Use oracle-armset-1 to build uekemb2 (Dave Kleikamp) [Orabug: 31950869]
- block: allow for_each_bvec to support zero len bvec (Ming Lei) [Orabug: 31955141] {CVE-2020-25641}
- uek-rpm: Update secure boot UEK signing certificates (Brian Maly) [Orabug: 31979628]
-
Thu Oct 08 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.401.4.el7uek]
- KVM: x86: always expose VIRT_SSBD to guests (Paolo Bonzini) [Orabug: 31957046]
-
Fri Sep 25 2020 Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com> [4.14.35-2025.401.3.el7uek]
- iommu/amd: Restore IRTE.RemapEn bit after programming IRTE (Suravee Suthikulpanit) [Orabug: 31931371]
- oracleasm: Access d_bdev before dropping inode (Stephen Brennan) [Orabug: 31901948]
- net: Correct warning: label 'drop' defined but not used. (John Donnelly) [Orabug: 31916130]
- KVM: Corrects build warnings for emulator_get_fpu/emulator_put_fpu (John Donnelly) [Orabug: 31907286]
- ext4: fix potential negative array index in do_split() (Eric Sandeen) [Orabug: 31895330] {CVE-2020-14314}
- net/rds: Extract dest qp num for displaying in rds-info (Praveen Kumar Kannoju) [Orabug: 31880143]
- bpf: Fix bpf_event_output re-entry issue (Allan Zhang) [Orabug: 31865842]
- bpf: fix nested bpf tracepoints with per-cpu data (Matt Mullins) [Orabug: 31865842]
- uek-rpm: Turn on module signing for embedded2 kernel (Dave Kleikamp) [Orabug: 31895264]
- uek-rpm: Clean up config-aarch64-embedded2 (Dave Kleikamp) [Orabug: 31895264]