Waypoint number in dataflash?

Hi all. Couple of questions related to dataflash logging:

  1. Is the current waypoint (mission item) number captured in a dataflash message? The CMD message captures what each mission item is, but is there some record kept of what number the flight controller is up to?

  2. It doesn’t appear to me that the CMD message captures the frame (MAV_FRAME) field. Is there some other way of determining which reference frame a mission item is in?

Hmm, partly answered my (1): I see that in addition to the CMD messages representing the mission been loaded, there are also further CMD messages which I assume are stored each time the active waypoint number changes.
Since the current field seems to not to be captured, they don’t look any different to the messages stored at the beginning storing the entire mission.