Merge "Add more access annotations." into main