Merge branches 'neeraj.2024.07.31a' and 'non-rcu.2024.08.02a' into HEAD

neeraj.2024.07.31a: RCU commits from Neeraj.
non-rcu.2024.08.02a: Non-RCU commits.