Merge "Fix figure numbering"