[NTG-context] Re-start figure numbers