Merge "Include a version number for DrawInstructions." into main