Changes for version 2.11

  • Fix multiple-prepare bug