Merge change 1124 into donut

* changes:
  Fix SQLite limit issue.