Merge "Update wait pointer from bitmap to vector." into main