Merge "LocklessQueue cleanup" into main