Merge "Fix undefined behavior iterating over waiting keys" into main